xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,252 Commits 1 Branch 0 Tags 17 MiB
8b3696982f
Commit Graph

1752 Commits

Author SHA1 Message Date
tawsi-melek
3f405b00f1 Revert back to previous char literal highlighter as it's more precise 2019-08-12 17:17:20 +02:00
tawsi-melek
228a8dd9ae Fix some more edge cases 
* Adapt the char literal highlighter from c-family.kak
* Fix line comment adjacent to char literal not being highlighted
* Fix single quote terminating a double quote string
 2019-08-12 16:40:35 +02:00
tawsi-melek
1c58e5aa90 Improve single line comments 
* '#' now gets highlighted as a char literal
* Remove highlighting for comment tags and escape sequences
 2019-08-08 22:47:22 +02:00
tawsi-melek
93e64b4541 Some more improvements 
* Fix keywords in comments being highlighted
* Highlight Nim's escape sequences for strings
* Highlight common comment tags
* Add on/off to the highlighted boolean values
* Remove redundant regex highlighter for comments
* Fix autoindent indenting lines more than it should
 2019-08-08 21:17:55 +02:00
Andrey Orst
396236f728 support raw strings withing the meta attributes 2019-08-07 11:37:02 +03:00
Andrey Orst
3156ecacc3 fix #3043 2019-08-06 17:02:51 +03:00
tawsi-melek
5ca0b9baa3 Enum too 2019-08-06 00:00:38 +02:00
tawsi-melek
ff7397b593 nim.kak: Add auto-indent after tuple and object 
Before:
```nim
type
  MyType = tuple
  myint: int     # This line needs to be indented manually
```

After:
```nim
type
  MyType = tuple
    myint: int     # Lines after 'tuple' are now indented automatically
```
 2019-08-05 22:02:56 +02:00
Maxime Coste
6eec6e656d Merge remote-tracking branch 'lenormf/fix-python-decorators' 2019-08-04 20:21:20 +10:00
Jason Felice
ba672623bc Insert Clojure ns directive for new files 2019-07-31 09:38:09 -04:00
codesoap
e502097d01 makefile.kak: require whitespace after target 2019-07-30 14:43:11 +02:00
codesoap
6e86766966 makefile.kak: remove reqex mismatch between highlight and indent 2019-07-30 10:00:04 +02:00
codesoap
4c3795faa2 makefile.kak: Refine regex for target 
Multiple targets and the target separators ':', '::' and '!' are now
supported.
 2019-07-30 09:55:25 +02:00
Frank LENORMAND
ff52bd7027 rc python: Highlight indented decorators with . 
Make sure decorators are on their own line, and don't stop highlighting at
the first dot when they are imported, e.g.

```
import enum

@enum.unique
class A(enum.Enum):
    …
```

Ideally highlighting shouldn't stop at the first parenthesis either
(e.g. `@foo(['1'])`), but the current code somewhat highlights the contents
of the parens already, which is good enough in most cases.
 2019-07-26 13:01:58 +03:00
Maxime Coste
550feb1706 Merge remote-tracking branch 'andreyorst/rust-highlighting' 2019-07-25 17:48:04 +10:00
Maxime Coste
6e1e79ed19 Merge branch 'master' of http://github.com/cglogic/kakoune 2019-07-25 17:26:41 +10:00
Oleh Hushchenkov
8fc705d4cc Fix c-family indent on opening curly brace after if-else 2019-07-25 09:58:33 +03:00
Maxime Coste
65327da4cf Merge remote-tracking branch 'laelath/markdown-lazy-load' 2019-07-24 17:38:00 +10:00
Justin Frank
a15ff0ffc3 Move module aliases to after main module definition 2019-07-22 23:48:30 -07:00
Justin Frank
8941002ce0 Give hooks a group so they're cleaned up 2019-07-22 19:03:04 -07:00
Justin Frank
89b50daa66 Use module alias pattern for markdown dynamic loading 2019-07-22 19:01:40 -07:00
aecepoglu
8691c1557a
ocaml.kak fix '"' and char literals 2019-07-22 23:49:15 +03:00
Andrey Orst
677d1efb23 move regex highlighters to the top, add method, field and function hl 2019-07-22 22:32:26 +03:00
codesoap
090c0b4db1 Allow / in target when highlighting in makefile.kak 2019-07-22 17:32:25 +02:00
Andrey Orst
3c0a350079 require module the old way 2019-07-22 18:22:44 +03:00
Andrey Orst
a81eb158be extend Rust highlighting 2019-07-22 15:56:29 +03:00
Maxime Coste
837416ea38 Merge remote-tracking branch 'MarSoft/nix-syntax' 2019-07-21 12:36:56 +10:00
Maxime Coste
d05ef24471 Merge remote-tracking branch 'gaeulbyul/css-comment' 2019-07-21 12:34:28 +10:00
Maxime Coste
268af7f61c Merge remote-tracking branch 'lenormf/patch-1' 2019-07-21 12:14:57 +10:00
Maxime Coste
27fce78eac Merge remote-tracking branch 'codesoap/ledger' 2019-07-21 12:08:42 +10:00
Gaeulbyul
bd257ceb7d css.kak: Highlight comment inside declaration 2019-07-18 01:33:57 +09:00
codesoap
0bd57817b3 Configure comment_line for the ledger filetype 2019-07-12 14:02:06 +02:00
David Ross
27ed20582f Add complete extra_word_chars for lisp 
See https://www.cs.cmu.edu/Groups/AI/html/cltl/clm/node27.html.
 2019-07-06 12:25:46 -07:00
David Ross
e65740873d Treat '-' as an word character in lisp 
'-' is part of identifiers in most or all lisps.

Strategy for implementing this copied from https://github.com/mawww/kakoune/blob/master/rc/filetype/scss.kak#L20.
 2019-07-05 06:44:45 -07:00
codesoap
2d15c13c1e ledger.kak: Automatically indent postings in transactions 2019-07-02 09:49:52 +02:00
codesoap
710ebabcb8 Add ledger filetype 2019-07-01 20:49:55 +02:00
Frank LENORMAND
a735c06714
rc git: Fix the indentation of misaligned commands 2019-07-01 12:56:51 +00:00
Maxime Coste
5c219cc743 Merge remote-tracking branch 'sjjf/sh_indent_v2' 2019-07-01 22:00:31 +10:00
Maxime Coste
2e3e0c47bb Merge remote-tracking branch 'greenfork/fix-ruby-end-autoinsertion' 2019-06-30 10:30:40 +10:00
Simon Fowler
b2459f5ecb Remove the sh_auto_indent option. 
We now auto indent by default, with the option to disable it handled by
the `diabled_hooks` mechanism.
 2019-06-29 12:34:14 +10:00
codesoap
ca2741fe20 Rename ModuleLoad hook to ModuleLoaded 
This clarifies, that the hook is run *after* the module is loaded.
 2019-06-25 19:16:47 +02:00
Frank LENORMAND
e5b9761818 rc filetype d: Highlight quoted backticks properly 
Fixes #2970
 2019-06-24 10:18:43 +03:00
Frank LENORMAND
b5321f3d1b rc filetype d: Highlight line tokens properly 2019-06-24 10:12:29 +03:00
Maxime Coste
2422c2dcd1 Merge branch 'repl' of https://github.com/codesoap/kakoune 2019-06-23 12:05:15 +10:00
Maxime Coste
4b7b5d077c Make quoting opt-in by using $kak_quoted_... 2019-06-23 12:04:21 +10:00
Dmitry Matveyev
68cdfb9b9d Add more ending blocks for ruby "end" keyword autoinsertion 2019-06-21 13:55:14 +03:00
Simon Fowler
04005b06b0 Add support for basic auto-indenting of sh code. 
This attempts to support a simple formatting and intentation style for
plain sh syntax (and other sh-compatible code which doesn't stray too
far from portable sh).

The complexity of sh syntax means that we have to be opinionated -
attempting to be more flexible would require extensive context
awareness, and would require something more akin to a proper
autoformatting tool or a language server.

The formatting style used here makes use of vertical whitespace as the
primary delimiter, so that code ends up looking like this:

if [ $foo = "bar" ]; then
        thing1
else
        thing2
fi

for i in foo bar baz; do
        thing1
        thing2
done

case "$foo" in
        bar) thing1;;
        baz)
                thing1
                thing2
                ;;
esac

Since the formatting style used is very opinionated the 'sh_auto_indent'
option can be used to disable auto-indentation, with the default set to
'no'.
 2019-06-20 13:19:15 +10:00
Maxime Coste
59e43c8f0c Merge remote-tracking branch 'lePerdu/latex-indent' 2019-06-19 23:03:20 +10:00
Maxime Coste
64b6bfa8ba Merge remote-tracking branch 'dgmulf/awk' 2019-06-19 23:02:21 +10:00
Maxime Coste
27902fa05f Merge remote-tracking branch 'greenfork/add-dart-highlighting-for-private-classes' 2019-06-19 23:01:56 +10:00
Maxime Coste
791dafbc97 Merge branch 'master' of http://github.com/codesoap/kakoune 2019-06-19 23:01:11 +10:00
codesoap
df03a8850c Comment on the escape sequence for setting the terminal's title 2019-06-18 11:52:33 +02:00
codesoap
9d8fb8bc31 Print escape sequence to set the window title 
Using xdotool was probably a little less portable, because it relied on
the newly created window to be activated by the window manager.
 2019-06-18 11:41:59 +02:00
codesoap
feebad14b0 Set the REPL window title using xdotool 
As mentioned in issue #2973, the -t argument for setting the terminal
title was not very portable.
 2019-06-18 09:58:32 +02:00
Daniel Mulford
952f919214 Basic language support for Awk 2019-06-17 22:12:15 -07:00
Dmitry Matveyev
aaa078f7c3 Add Dart highliting for private classes 2019-06-17 22:11:19 +03:00
Dmitry Matveyev
bd22b28d39 Fix Dart highlighting of annotations 2019-06-16 11:53:19 +03:00
Maxime Coste
9d52822702 Merge remote-tracking branch 'greenfork/ruby-do-keyword-support' 2019-06-15 10:55:44 +10:00
Maxime Coste
d801c18a54 Merge remote-tracking branch 'alexherbo2/crystal' 2019-06-15 10:52:59 +10:00
Maxime Coste
f4f361e212 Merge remote-tracking branch 'ath3/editorconfig-max_line_length' 2019-06-15 10:51:54 +10:00
codesoap
38d3432d1a Make the readtags command configurable in ctags.kak 
On OpenBSD the command that comes with the universal-ctags package is
called 'ureadtags'.
 2019-06-14 13:21:33 +02:00
ath3
8c7d447574 max_line_length support for editorconfig 2019-06-13 00:03:45 +02:00
Dmitry Matveyev
01159a9e72 Add support for autoformatting after do keyword in Ruby 2019-06-12 09:03:24 +03:00
Alex Leferry 2
d97688b624 Update Crystal 2019-06-11 18:33:08 +02:00
Maxime Coste
85e2dc6252 Merge branch 'man' of http://github.com/codesoap/kakoune 2019-06-11 23:19:52 +10:00
Maxime Coste
a93f54192e Merge branch 'st' of http://github.com/codesoap/kakoune 2019-06-11 23:19:10 +10:00
Maxime Coste
8023c1d094 Merge branch 'patch-1' of http://github.com/hacktivista/kakoune 2019-06-11 23:08:54 +10:00
Maxime Coste
a16cae2daf Fix ctags-search menu escaping 2019-06-11 20:13:03 +10:00
codesoap
683c7c1fa5 Fix fifos for Linux 
Those were accidentaly broken while fixing for OpenBSD.
 2019-06-10 18:25:51 +02:00
Felix Freeman
f246313951 Consider */ closing comment on PHP automatic indentation prefix 2019-06-10 12:12:06 -04:00
codesoap
9ca9d40c03 Revert "Don't create subshells when unnecessary" 
This reverts commit 6c05e6e0f8.
Apparently the Linux sh needs subshells here.
 2019-06-10 18:00:11 +02:00
hacktivista
2bc14edfd2 Fix PHP comments indentation 2019-06-10 10:47:19 -04:00
codesoap
6c05e6e0f8 Don't create subshells when unnecessary 2019-06-09 13:24:30 +02:00
codesoap
009eb80ca0 Fix tools using fifos for OpenBSD 
Without these changes, kak would hang on the corresponding commands,
displaying a 'waiting for shell command to finish' message.
 2019-06-09 11:50:35 +02:00
codesoap
11dfd4994b Escape '(' in shell parameter expansion in man.kak 
Not escaping '(' here led to a 'no closing quote' error on OpenBSD.
 2019-06-07 21:48:28 +02:00
codesoap
7ade105319 Add st (simple terminal) to the known terminals 2019-06-07 21:46:20 +02:00
Maxime Coste
09e1ec97a9 Merge remote-tracking branch 'alexherbo2/crystal' 2019-06-06 23:14:51 +10:00
Maxime Coste
ecf3853bde Merge remote-tracking branch 'alexherbo2/r-rename' 2019-06-06 23:14:44 +10:00
codesoap
10ad877a4d Remove extraneous '\' from git.kak 2019-06-06 13:17:21 +02:00
Maxime Coste
733cf564df Merge remote-tracking branch 'elasticdog/spell-len-whitespace' 2019-06-06 20:17:08 +10:00
Alex Leferry 2
cd0665d61b Update Crystal 2019-06-05 17:34:18 +02:00
codesoap
7c8c5ad506 Remove ' from comment in subshell 
On OpenBSD's sh this causes a "no closing quote" error.
 2019-06-05 15:16:07 +02:00
Alex Leferry 2
39e2604420 Rename R.kak → r.kak 2019-06-04 13:56:08 +02:00
Aaron Bull Schaefer
3a401f0771 Trim whitespace from spell check word length variable 
Due to ambiguity in the POSIX standard, GNU and BSD versions of the `wc`
utility use slightly different whitespace conventions when formatting
their output [1]. When limiting the output to just counting the number
of bytes (as is done by Kakoune when calculating the length of words
for spell check highlighting), the BSD version of `wc -c` has some
additional leading whitespace:

    gnu$ printf %s "test" | wc -c
    4
    bsd$ printf %s "test" | wc -c
           4

This leading whitespace needs to be removed before defining the "region"
to highlight, or `set-option` will not be able to parse the given
`spell_regions` and will complain that there are "not enough elements
in tuple." In other words, the region `1.21+8|Error` on Linux ends up
looking like `1.21+       8|Error` on macOS, which is invalid.

Removing the whitespace could be accomplished in a number of ways, but
using arithmetic expansion [2] is POSIX compliant and does not require
shelling out to another process.

[1]: https://unix.stackexchange.com/questions/205906/extra-space-with-counted-line-number
[2]: https://mywiki.wooledge.org/ArithmeticExpression
 2019-06-02 20:23:42 -07:00
lePerdu
dbe32d314f Add auto-indent scripts for LaTeX 2019-05-31 11:44:15 -04:00
Semyon Maryasin
accc203718
Add syntax highlighting for Nix package manager 
Based on PHP. It is not ideal yet but much better than nothing.
 2019-05-29 21:13:33 +03:00
Maxime Coste
14f45c0020 Merge remote-tracking branch 'alexherbo2/crystal' 2019-05-29 20:46:59 +10:00
Maxime Coste
cbcc9d09ca Merge branch 'master' of https://github.com/musclewizard/kakoune 2019-05-29 20:31:22 +10:00
Maxime Coste
8ae490752f Merge remote-tracking branch 'greenfork/add-test-ruby-alternative-file' 2019-05-29 20:09:38 +10:00
Michael Mogenson
6905b6e34a Automatic insert completion using ctags 
Fixup ctags-complete command to search for partial matches for the
current selection in all tags files listed in ctagsfiles option. Format
the results to fit the Kakoune completions type.

Add ctags-enable-autocomplete and ctags-disable-autocomplete commands to
add and remove an InsertIdle hook to select the previous word and call
ctags-complete.

Use the ctags_min_chars option to limit the noise of returning many
completions for very short selections.
 2019-05-28 10:00:39 -04:00
Dmitry Matveyev
329ede9094 Add test/ ruby-alternative-file implementation 2019-05-25 12:39:52 +03:00
Justin Frank
1adc5f080b Added wip markdown code lazy-loading hook 2019-05-24 09:41:05 -07:00
James Thomas
5537645ea5 changes the name of a buffer being linted from /tmp/kak-lint.XXXXXX/buf.$extension to /tmp/kak-lint.XXXXXX/$filename. This allows the linter to compile Java files, which fail to compile if the Class name does not match the File name being linted. 2019-05-23 15:52:57 -04:00
Maxime Coste
9ffde03ca7 git.kak: support highlighting git log decorations 2019-05-23 12:42:38 +10:00
Alex Leferry 2
fff7e9b064 Add support for Crystal 
https://crystal-lang.org
 2019-05-21 18:25:29 +02:00
Maxime Coste
6b7f445936 Merge remote-tracking branch 'eraserhd/clojure-fix-for-1-char-symbols' 2019-05-21 21:36:30 +10:00
Maxime Coste
ef1523fbb0 Merge remote-tracking branch 'andreyorst/fix-racer' 2019-05-21 21:34:08 +10:00
Dawid Ciężarkiewicz
d4b57b5b00
rust: Highlight async/await keywords 2019-05-17 20:26:30 -07:00
Andrey Orst
ea960dcdfd simplify rust completion to match generic Kakoune completions 2019-05-17 20:00:40 +03:00
Maxime Coste
6a65415a19 Merge remote-tracking branch 'andreyorst/ctags' 2019-05-17 19:54:38 +10:00
Maxime Coste
33f9e28610 Merge remote-tracking branch 'ericricky/master' 2019-05-17 19:52:46 +10:00
Andrey Orst
27b6889daf fix #2909 broken rust autocomplete 2019-05-16 08:39:58 +03:00
Jason Felice
ee9c9a777c clojure: Fix indentation for lists with 1-character heads 
Indentation can be different depending on the first word of list forms.  The
indent hook uses `e` from inside the parent to select the first word for
testing whether it is a special word; however, in the case of a one-character
symbol, this selects to the end of the *next* word.

This rejects such selections.
 2019-05-15 11:20:10 -04:00
Ramiro Romero Arjona
f60a403c1b
Change regular expression for git blame to one more supported 
Change regular expression in git blame, removing braces. New expression is supported on various awk engines used in some distributions as default ones. As trade-off, the new expression accepts more input character sequences.
 2019-05-02 21:27:25 +02:00
Andrey Orst
3e85406ec1 reimplemented ctags-search command 2019-04-29 17:21:02 +03:00
nonumeros
84ee2b382f adding init to git.kak, removed candidates 
adding init to git.kak

removing git init EOF line

git ls-files on on git.kak

no candidates for git-init, removed function

removed candidates for git-init
 2019-04-27 01:23:21 -04:00
Steven Chan
b1602d4490 Fix #2495 - Add hyperlink support to :man 
1. Add commands to navigate between man page links.
2. Add command to jump to a man page by following a man page link.
3. Add key map for <ret> to jump command.
4. Add key maps for a suggested user mode.
 2019-04-26 12:35:54 -07:00
rs
bd3ec61784 Add support for R 2019-04-25 10:44:43 -05:00
Maxime Coste
0cc89b2b9f Merge remote-tracking branch 'laelath/provides-requires' 2019-04-25 11:59:42 +01:00
Steven Chan
64fd0c72ce Enable man command to show stderr message to the user 
1. If there is no man page found (error 16), then echo stderr text.
2. For other kinds of errors, fail with stderr text so that command can propagate through a try/catch.
 2019-04-24 14:49:56 -07:00
Steven Chan
734a7d0707 Re-implement PR #1927 - man bufname should indicate man page. 2019-04-24 14:49:47 -07:00
rs
429eeb252c Fix kak file recognition 2019-04-24 16:06:46 -05:00
Alex Leferry 2
02ce53d20e Use complete URL 2019-04-24 03:33:54 +02:00
Maxime Coste
17c5e7aa5f Merge remote-tracking branch 'alexherbo2/rc-javascript-accessors' 2019-04-20 10:33:38 +02:00
Maxime Coste
b65fcb5d1a Merge remote-tracking branch 'alexherbo2/rc-mime-detection' 2019-04-20 10:30:05 +02:00
Alex Leferry 2
4d12e750ae Highlight JavaScript accessors 2019-04-19 12:31:39 +02:00
Alex Leferry 2
ba1274f73c file.kak: Dereference symlinks 2019-04-17 12:37:54 +02:00
Alex Leferry 2
313c6eadc7 file.kak: Use -i POSIX option name 
https://ss64.com/osx/file.html
https://freebsd.org/cgi/man.cgi?query=file
 2019-04-17 12:37:17 +02:00
Maxime Coste
9118a18d5d Change completions option docstring element to be an arbitrary command 
We can have the previous behaviour by just passing the docstring to
`info -placement menu`.
 2019-04-17 08:38:52 +02:00
Maxime Coste
02fc42a12a Rename info -placement to info -style and support modal style 
Fixes #1375
Closes #1380
 2019-04-17 08:38:52 +02:00
Justin Frank
48abc3cbf3 Changed '🦀' to '§' for complex module quoting 2019-04-13 12:57:57 -07:00
Justin Frank
6512eafa60 Update remaining files to new provide/require format 2019-04-11 15:54:58 -07:00
Justin Frank
c2b32ebaa7 Clean up javascript file a bit 2019-04-10 17:08:05 -07:00
Justin Frank
e959b99050 Fixed several more support files. 2019-04-10 16:48:46 -07:00
Justin Frank
80ac46e09d Fixed many of the filetype support modules to not use BufSetOption to load 2019-04-09 20:54:19 -07:00
Justin Frank
887a5223ac Fixed if statement in x11 detection 2019-04-08 17:08:35 -07:00
Justin Frank
49b00992ca Fix x11 overriding tmux 2019-04-08 17:05:55 -07:00
Justin Frank
aa6d19bee6 Added modules to extra files 2019-04-08 17:05:55 -07:00
Justin Frank
c3f694a28f Modified base files to use modules 2019-04-08 17:02:44 -07:00
Justin Frank
1fab727f2b Modified a bunch of language support files to use modules 2019-04-08 17:02:44 -07:00
Hampus Fröjdholm
ec68b6a712 Add Python 3.7 breakpoint to list of built-in functions. 2019-04-04 04:46:20 +02:00
Maxime Coste
a32da9d3ee Fix spurious error from c-family-indent-on-closing-curly-brace 2019-04-01 22:20:43 +11:00
Grant Moyer
d8e4c6801f Fix autoindent issues with paren in literal 2019-03-31 00:07:12 -04:00
Maxime Coste
2c283d46a5 Merge remote-tracking branch 'GrantMoyer/rust-block-indent' 2019-03-29 20:12:34 +11:00
Maxime Coste
bcc8b88710 Merge remote-tracking branch 'GrantMoyer/preserve-tabs-for-autoindent' 2019-03-29 20:08:59 +11:00
Grant Moyer
71c5077bec Block indent on newline when previous line is '(stuff' and move 'stuff' to own line 
Also, align closing paren on own line with opening paren
 2019-03-28 13:17:57 -04:00
Grant Moyer
61840c8b11 Preserve tabs during autoindent and alignment with '(' for c-family languages 
Also add test for tab preservation during c-family autoindentation, and correct alignment of '}' with opening of block in cases of wrap between '(' and ')' in c-family languages
 2019-03-28 13:08:02 -04:00
Alex Leferry 2
c7218940cb Make kitty honoring the current working directory 
Fixes #2819
 2019-03-28 14:29:54 +01:00
Maxime Coste
4b98b89437 sh.kak: Use a region for shell expansions 
Fixes #2763
 2019-03-26 13:04:31 +11:00
Maxime Coste
615c92f6e2 Merge branch 'patch-1' of https://github.com/pickfire/kakoune 2019-03-24 12:32:28 +11:00
Ivan Tham
ac4ad861ab
Fix hook 2019-03-23 15:48:12 +00:00
Ivan Tham
ae7f65acd8
Default to rustfmt for formatcmd in rust 
`rustfmt` is the de facto standard for formatting in rust so setting it by default would be nice.

https://github.com/mawww/kakoune/issues/2801
 2019-03-22 16:59:24 +00:00
Alex Leferry 2
9ef37666ea Remove ranger.kak 2019-03-22 13:29:22 +01:00
Alex Leferry 2
7d400dce7f Add windowing/repl category 2019-03-21 12:09:39 +01:00
Maxime Coste
00185995e4 Merge remote-tracking branch 'alexherbo2/rc-categories' 2019-03-21 21:10:36 +11:00
Alex Leferry 2
c0dccdd90d Add categories in rc/ 
Closes #2783
 2019-03-21 01:06:16 +01:00
Justin Frank
767b7e48dd Cleanup of fish.kak. Fixes #2775 2019-03-19 09:51:42 -07:00
Maxime Coste
da687f8b7d Merge branch 'patch-1' of http://github.com/andreyorst/kakoune 2019-03-16 12:40:40 +11:00
Maxime Coste
77d75437b8 Merge remote-tracking branch 'eraserhd/use-semantic-face-names' 2019-03-16 12:02:21 +11:00
Alyssa Ross
60dd81d7d8
Highlight all default Ruby symbols correctly 2019-03-15 17:32:49 +00:00
Alyssa Ross
c409bce579
Recognize Ruby identifiers beginning with _ 
:_foo, @_foo, $_foo, and { _foo: 1 } are all valid Ruby syntax, but were
not recognized by the highlighter.
 2019-03-15 16:24:44 +00:00
Frank LENORMAND
2c19c2d84c rc: Use builtin faces 2019-03-14 10:53:13 -04:00
Andrey Orst
e5558aee63
highlight floating point numbers with exponent 
Correct highlihgting for `0.38e-18` like numbers
 2019-03-13 17:01:17 +03:00
Maxime Coste
bfc2a178f2 Merge remote-tracking branch 'alexherbo2/kakrc-add-force-commands' 2019-03-13 06:51:16 +11:00
Maxime Coste
017b7c970e Merge branch 'patch-1' of https://github.com/andreyorst/kakoune 2019-03-06 22:51:40 +11:00
Maxime Coste
55c60153df Merge remote-tracking branch 'alexherbo2/rc-markdown' 2019-03-06 22:49:46 +11:00
Andrey Orst
81fc15057c
Add KDE Konsole terminal to termcmd 
Konsole doesn't work well with non-default Kakoune themes, so I've put it last in the list, but in case when no other terminal is available it's good to have it in the list for launching non-kakoune things, like tig
 2019-03-06 12:58:57 +03:00
Olivier Perret
dc8481776c Various fixes to iterm.kak 
The 'terminal' alias wasn't automatically setup
Missing '\' in sed calls
Descriptions of vertical and horizontal split was swapped around
 2019-03-05 21:00:01 +01:00
Alex Leferry 2
7c9053cdec Remove invalid Markdown syntax 2019-03-05 15:07:17 +01:00
Alex Leferry 2
35ace812df Markdown: Highlight TOML code blocks 2019-02-18 07:42:49 +01:00
Maxime Coste
6da4761065 Merge remote-tracking branch 'eraserhd/lisp-indentwidth' 2019-02-11 21:58:06 +11:00
Maxime Coste
4636440622 Merge remote-tracking branch 'laelath/c-family-else-indent' 2019-02-11 21:53:05 +11:00
Justin Frank
58c15b0240 Indent and deindent c-family single line else properly 2019-02-08 15:16:29 -08:00
Alex Leferry 2
8aba642535 kakrc: Add force commands 2019-02-06 20:26:32 +01:00
fsub
3f29d5ebbf ctags: eliminate redundant variable 2019-02-04 20:14:19 +01:00
Jason Felice
58ab144865 Use indentwidth for lisp, scheme, and Clojure 2019-02-04 12:23:57 -05:00
Maxime Coste
4a2cd39eac Merge remote-tracking branch 'stevenyvr987/fix-ctags-funcinfo-command' 2019-02-03 09:56:18 +11:00
lePerdu
eaa5c0d297 Remove +F from tag attribute highlighting 2019-01-31 09:22:08 -05:00
Steven Chan
568d46bf72 Fix and simplify ctags-funcinfo command 
1. Enable the command to correctly show the prefix of a function name [prefix::basename],
   where prefix is the value gotten from a class, struct, or namespace field of the tag line.

2. Use a readtag filter expression to replace a use of grep.
 2019-01-29 11:17:23 -08:00
Maxime Coste
1b469f4c00 Merge http://github.com/ckafi/kakoune 2019-01-23 20:24:24 +11:00
Steven Chan
ae86ffcbf9 Fixes for ctags.kak 
1. Fix #2250. Enable ctags to handle absolute file paths.
   Only prepend tagroot to tag location if it is a relative file path.

2. Include signature field in the default ctags command.
   The regex for displaying signature info includes a mandatory pattern
   for 'signature' field, but the field is not a default option for the ctags command.
   If the tags file is generated by the as-is ctags command, pattern matching will fail,
   and the whole ctags line for the selected function will be displayed instead.
 2019-01-21 15:09:33 -08:00
Maxime Coste
ca105f8cc6 Rework c-family shell expansions to speed them up slightly 2019-01-20 12:33:46 +11:00
Maxime Coste
a9ee4e8af4 Small optimization in clojure.kak awk script 2019-01-20 12:32:31 +11:00
Maxime Coste
a35a1591d0 Convert scheme.kak expensive shell scope to awk 2019-01-20 12:31:57 +11:00
Maxime Coste
8587ecaeb4 Slight simplification in c-family.kak 
There is no need to have split types/macros into many different
variables.
 2019-01-19 11:33:53 +11:00
Maxime Coste
2f7ec014b7 Use a here-document for clojure.kak awk script 2019-01-19 10:42:46 +11:00
Maxime Coste
41ce602574 Fix some escaping issues in clojure.kak 2019-01-19 10:29:23 +11:00
Maxime Coste
4a358e0707 Merge remote-tracking branch 'eraserhd/clojure-highlighting-with-awk' 2019-01-19 10:14:05 +11:00
Jason Felice
52c0b7d6b4 Rewrite clojure highlighting to use awk 
First, avoids the shell escaping issue mentioned in #2604.  Second,
speeds up Kakoune boot time.
 2019-01-18 11:20:15 -05:00
Tobias Frilling
ef19d318c4 Better tmux REPL support 
This allows one REPL per kakoune session and allows the REPL to run in a
different tmux session than the kakoune client.
 2019-01-18 14:42:04 +01:00
Maxime Coste
0f9e6680e2 Support quoted here-documents in sh highlighting 2019-01-17 19:58:53 +11:00
Maxime Coste
da8058487b Fix C++ raw strings not being checked for matching captures 2019-01-17 19:50:43 +11:00
Maxime Coste
0600724a8b Improve some corner cases in c-family auto-indenting 2019-01-14 23:42:57 +11:00
Maxime Coste
30919b749c Merge remote-tracking branch 'JJK96/bash' 2019-01-13 23:41:24 +11:00
Jan-Jaap Korpershoek
b306f6aa37 [Bash] Handle hashtag inside expansion (Fix #2684) 2019-01-11 00:02:36 +01:00
Maxime Coste
7dbd9bc1e2 Merge remote-tracking branch 'SolitudeSF/nimfix' 2019-01-10 20:28:07 +11:00
Jan-Jaap Korpershoek
c0588529c2 Merge branch 'master' into i3 2019-01-09 16:09:11 +01:00
Jan-Jaap Korpershoek
cb13fb63d3 Add new keywords 2019-01-09 16:08:14 +01:00
SolitudeSF
289b57bb67
rc: nim - properly highlight hex/oct/bin literals, refactor, fix more edgecases 2019-01-08 21:08:46 +02:00
fsub
059b086e62 c-family: Regroup C++ keywords and consider C++20 2019-01-06 19:22:48 +01:00
Justin Frank
8a6a76fcd3 Added 'catch' to kakrc keywords 2019-01-02 13:30:34 -08:00
Maxime Coste
090ccafa8d Merge remote-tracking branch 'Muffindrake/uch_stdlib' 2018-12-30 10:55:26 +11:00
SolitudeSF
d010b163fa
rc: nim - fix prefixed triplestring edgecase 2018-12-29 19:31:49 +02:00
Maxime Coste
81cef40171 Merge remote-tracking branch 'SolitudeSF/nimfix' 2018-12-29 10:34:45 +11:00
SolitudeSF
a9ef25f172
rc: add missing builtin types, fix displaying of triple string literals, float literals, character literals, type suffixes, enable raw string literals, operators highlighting in nim 2018-12-27 21:49:00 +02:00
Maxime Coste
e2f2503da4 Merge remote-tracking branch 'SolitudeSF/nimfix' 2018-12-28 06:43:24 +11:00
Maxime Coste
f54ba6d4b2 Merge remote-tracking branch 'lenormf/fix-git-notes' 2018-12-28 06:40:13 +11:00
SolitudeSF
a4e65d4706
rc: add missing builtin types, fix displaying of triple string literals, float literals, character literals, type suffixes, enable raw string literals in nim 2018-12-27 21:34:33 +02:00
Maxime Coste
1c7b63709f Merge remote-tracking branch 'occivink/generic-term-command' 2018-12-28 06:27:51 +11:00
Jason Felice
1631327c33 Some collected fixes for Clojure highlighting 
- condp is a keyword
- Highlight '10' correctly
- Highlight shebang line as a comment
 2018-12-27 11:46:54 -05:00
Olivier Perret
eebc8c2f7d Fix a couple of mistakes in iterm.kak 2018-12-22 10:32:25 +01:00
Olivier Perret
5146f7ba33 Rework 'terminal' commands 
* Arguments of the kakoune command are now preserved in the shell call
* Escaping logic is moved from 'new' to 'terminal'
 2018-12-22 09:37:17 +01:00
Olivier Perret
02fa967476 Factor the 'new' commands out of their respective windowing systems 2018-12-22 09:37:03 +01:00
Olivier Perret
3e4f3ed9d2 Better handling of escaping in iterm.kak 
Thanks eraserhd
 2018-12-22 09:37:03 +01:00
Olivier Perret
84da1911be Attempt to create iterm-terminal commands 2018-12-22 09:37:03 +01:00
Olivier Perret
74d1dc756a Only accept one parameter to 'terminal' commands 
Also explicitly state that they're executed in a shell scope
 2018-12-22 09:37:01 +01:00
Olivier Perret
c8403624a7 Expose a 'terminal' command for the various windowing systems 
It allows plugins to create generic terminal using the user's preferred windowing system
For example, it can be used to run fzf, gdb or simply a shell.

* 'new' commands are refactored to simply use the 'terminal' one
* style and docstrings has been unified
* all windowing systems go through "sh -c" for consistency purposes, even if unnecessary
 2018-12-22 09:36:34 +01:00
Olivier Perret
6f9e297def Revert cosmetic hook order change 
The order in which they're run actually matters
 2018-12-20 19:15:40 +11:00
Olivier Perret
f085e43bf9 Unify auto-indent trimming hooks 
* ModeChange hooks that remove indent now belong to *-trim-indent groups, instead of just -indent
* *-filter-around-selections hooks and commands have been renamed to trim-indent for clarity
 2018-12-19 10:20:11 +01:00
Olivier Perret
d8466f0f39 c-family.kak: remove redundant -family in hook groups 2018-12-19 10:03:37 +01:00
Muffindrake
bcb87279e5 Remove accidental line paste 2018-12-15 10:30:53 +01:00
Muffindrake
2e141d2c2c Add atomic type qualifier and atomic_flag type 2018-12-15 09:54:22 +01:00
Muffindrake
bbd34de26c Add missing stdlib macro highlighting and uchar types 2018-12-15 09:33:46 +01:00
Maxime Coste
e49a0d2581 doc.kak: Do not join together bullet lists 
Fixes #2610
 2018-12-13 19:36:23 +11:00
Frank LENORMAND
9b9aedd175 rc lint: Prevent diagnostics from being expanded 
Fixes #2629
 2018-12-13 10:42:52 +03:00
Maxime Coste
527e28539e Merge remote-tracking branch 'occivink/cleanup-hook-once' 2018-12-11 10:39:24 +11:00
Olivier Perret
27f951638c Execute cleanup hooks on any filetype change 2018-12-11 00:35:57 +01:00
Olivier Perret
93c308ca53 Fixes to d.kak and moon.kak 2018-12-11 00:13:30 +01:00
Olivier Perret
f5a2ded44b Change cleanup of extra/ languages to use a simpler hook -once 2018-12-11 00:13:30 +01:00
Olivier Perret
898d45f5d5 Change cleanup of base/ languages to use a simpler hook -once 2018-12-11 00:13:30 +01:00
Olivier Perret
6765723c68 Change cleanup of core/ languages to use a simpler hook -once 2018-12-11 00:13:30 +01:00
Frank LENORMAND
f8d660027b rc git: Support the break instruction 2018-12-10 20:10:05 +03:00
Frank LENORMAND
17ebc582b6 rc scheme: Fix the initialization of the static words 
Fixes #2607
 2018-12-01 07:40:55 +03:00
Maxime Coste
a7336f8663 Merge remote-tracking branch 'sbwhitecap/pr/treat_t_files_as_perl' 2018-11-28 21:28:07 +11:00
Maxime Coste
086db6a9d3 Fix extra_word_chars in various scripts 
Add '_' to the list now that it is not built-in anymore
 2018-11-28 18:13:55 +11:00
Kazuki Shigemichi
5221254363 Treat .t files as perl 2018-11-27 22:43:50 +09:00
Maxime Coste
4610166263 Merge remote-tracking branch 'lePerdu/markdown_highlighter' 2018-11-27 18:22:21 +11:00
Alyssa Ross
9e99415c46
makefile.kak: highlight .mk files 
This extension is commonly used for helper files, etc.
 2018-11-26 02:20:31 +00:00
Maxime Coste
bef7683e1b Merge remote-tracking branch 'Muffindrake/c_stdint' 2018-11-25 22:59:22 +11:00
Maxime Coste
2598fc1534 Merge remote-tracking branch 'lePerdu/fix-lua-comments' 2018-11-25 22:58:55 +11:00
Maxime Coste
ec6b88be96 Merge remote-tracking branch 'jjthrash/master' 2018-11-23 22:32:35 +11:00
Muffindrake
d40a6bc44a Highlight bool type 2018-11-23 00:12:01 +01:00
Jimmy Thrasher
576f7b13b9 Don't highlight Ruby eigenclass definitions as here docs 
E.g. for the following code snippet, the code was highlighted as a string
```ruby
class Bob
	class <<self
		def hello
		end
	end
end
```
 2018-11-21 16:45:07 -05:00
Olivier Perret
808580056f doc: don't pollute command history with mapping 2018-11-21 17:30:58 +01:00
Maxime Coste
3ed7ec21bd Merge branch 'python_add_async_await_keywords' of http://github.com/Roger/kakoune 2018-11-19 21:07:53 +11:00
Maxime Coste
c4ffd95570 Merge remote-tracking branch 'JJK96/master' 2018-11-19 20:50:11 +11:00
Maxime Coste
f46b53a441 Merge branch 'gas-hex-fix' of http://github.com/andreyorst/kakoune 2018-11-19 20:49:40 +11:00
lePerdu
41d2176179 Add back list marker highlighting 2018-11-18 10:34:11 -05:00
lePerdu
9053a1cdc1 Make list items match as regions 2018-11-18 10:34:06 -05:00
Frank LENORMAND
70097a98b3
Sinplify regex 
Co-Authored-By: JJK96 <jjkorpershoek96@gmail.com>
 2018-11-18 08:28:50 +01:00
Frank LENORMAND
7dd81ec516 rc git: Support notes 2018-11-17 16:47:29 +03:00
Jan-Jaap Korpershoek
7fc43252f1 Make header clearer 2018-11-16 13:56:48 +01:00
Jan-Jaap Korpershoek
1228eddc00 Add markdown sql language support 2018-11-16 13:54:43 +01:00
Andrey Orst
3e194fbb2e fix hex numbers for gas filetype - add missing a-f letters 2018-11-13 13:02:04 +03:00
lePerdu
e539347f2a Give lua block comments higher match precedence 2018-11-12 15:39:34 -05:00
roger
b672e7c100 python: add async/await keywords highlighting 2018-11-12 15:03:32 +01:00
Muffindrake
a807dbf1e0 Add missing highlighting for time/wctype 2018-11-11 15:33:55 +01:00
Muffindrake
3012bf48e5 Convert subshells to strings 2018-11-08 18:26:16 +01:00
Muffindrake
3c9f9255d7 Add macros for float.h 2018-11-08 18:03:31 +01:00
Muffindrake
f088dd957a Update C grammar 
This highlighting and static completion for types and macros that were
previously missing. No functions are included, but some macros are
highlighted as such, even if they're function-like macros.
 2018-11-08 10:30:27 +01:00
Maxime Coste
9bc893e70b Merge remote-tracking branch 'laelath/c-indent-fixes' 2018-11-06 20:22:50 +11:00
Maxime Coste
bcd50d7dd8 Merge remote-tracking branch 'eraserhd/clojure-indent-fix' 2018-11-06 20:16:57 +11:00
Justin Frank
521e5032c9 Don't require content in parens for single statment indent 2018-11-01 00:21:48 -07:00
Justin Frank
ee65954ed4 Make statement after if/else/while/for optional for indenting c-family 2018-10-31 16:09:13 -07:00
Jason Felice
db937beff0 Make lisp/clojure indent work for append 2018-10-29 12:16:13 -04:00
Ruslan Prokopchuk
b65a6493aa replace usage of the deprecated 'e' face attribute with the new 'F' one 
and update set-face docstring
 2018-10-28 08:52:14 +11:00
Maxime Coste
433e39566d Merge remote-tracking branch 'lenormf/highlight-troff' 2018-10-23 08:20:21 +11:00
Jason Felice
e399bf7562 EDN files are Clojure syntax 2018-10-22 10:23:26 -04:00
Frank LENORMAND
2999702b01 rc troff: Highlight *ROFF files 
Fixes #2508
 2018-10-21 16:24:14 +03:00
Maxime Coste
7470c85a1a Merge remote-tracking branch 'maximbaz/do-not-enforce-autoformat-ocaml' 2018-10-21 18:45:16 +11:00
Maxime Coste
7dbca46bf0 Merge remote-tracking branch 'schickm/bugfix/hbs-highlighter-toggling' 2018-10-21 11:52:22 +11:00
Sébastien Lerique
681942e44b Support commenting syntax in Elm 2018-10-09 11:40:07 +02:00
Matt Schick
8e698e0054 Simplify handlebars adding/removal hooks 
Removing the handlebars highlighters when a client toggles away from hbs window unintentionally causes
other clients attached to hbs windows to no longer highlight correctly.  The only other option is to
copy the entire html highlighter and all of it's rules, but that seems like a maitenance headache.
So instead, just leave the hbs rules injected into the html rules once the user opens any handlebars file.
It's not ideal, but I'd say it's the least bad option.
 2018-10-06 08:39:01 -05:00
Maxime Coste
888ec60adf Fix kakrc shell script completion region definitions 2018-10-06 10:49:14 +10:00
Maxime Coste
5bdcfab018 Merge remote-tracking branch 'laelath/shell-command-completion' 2018-10-06 10:47:23 +10:00
Maxime Coste
81fa2ad300 Merge remote-tracking branch 'laelath/kitty-repl-cwd' 2018-10-04 20:17:22 +10:00
Maxime Coste
d9e95ff1fc Merge branch 'patch-1' of https://github.com/andreyorst/kakoune 2018-10-04 20:16:47 +10:00
Justin Frank
ab6bc41358 Added shell command completion support to define-command and prompt 
This commit also introduces a regression in that I decided that the best way to
avoid overly long and confusing names was to rename the current shell-*
switches to script-*, and have the shell command completion be
shell-completion.

renamed script-{completion,candidates} to shell-script-*

Updated docs with new switch names

Added -shell-completion switch to x11-repl and kitty-repl
 2018-10-03 09:46:31 -07:00
Justin Frank
74fb175da1 Made kitty repl window start in the current working directory 
Enclose PWD expansion
 2018-10-03 09:44:49 -07:00
Andrey Orst
44483e06f7
Simplifed regex variant by mawww 2018-10-03 15:16:16 +03:00
Maxime Coste
fd00776012 Merge remote-tracking branch 'schickm/html-highlighter-indent-bugfix' 2018-10-03 21:44:43 +10:00
Andrey Orst
5dce923785
use more complex regex to handle all suffix combinations 2018-10-02 19:01:53 +03:00
Matt Schick
1d731dbdd0 Fix/improve html-indent-on-new-line 
* Fixes erroring execute-keys statement by using '<lt>' rather then '<'
* Reworks hook to not indent after self closing tags
 2018-10-02 06:09:14 -05:00
Tim Allen
8385212f98 doc.kak: Fix bashism. 
Fixes #2442.
 2018-10-01 15:45:28 +10:00
Maxime Coste
150ee05077 Merge remote-tracking branch 'lenormf/fix-doc-anchor' 2018-10-01 11:18:20 +10:00
Maxime Coste
c9467ea959 Merge remote-tracking branch 'lenormf/fix-extended-std-c' 2018-10-01 11:13:16 +10:00
Maxime Coste
dc7f9a813c Merge remote-tracking branch 'TeddyDD/editorconfig' 2018-10-01 11:12:05 +10:00
Maxime Coste
2e0b58a43f Merge remote-tracking branch 'eraserhd/lisp-indent' 2018-10-01 11:11:11 +10:00
Maxime Coste
5709ff7f20 Merge branch 'kd/fix-nim-singlequote-highlighter' of git://github.com/kdheepak/kakoune 2018-10-01 11:10:42 +10:00
Frank LENORMAND
798a7ec351 rc doc: Fix the anchor jump error message 
Fixes #2442
 2018-09-30 10:43:27 +03:00
Frank LENORMAND
51ced99286 rc c: Highlight more standard types and macros 
Related to #2438
 2018-09-29 17:43:06 +03:00
Daniel Lewan
0ae88593d3 add highlighting and static words to editorconfig 2018-09-29 14:21:31 +02:00
Jason Felice
e237bf6f15 Better Lisp and Clojure indent 
Algol-like indenting doesn't work for Lisp as we tend to open (and
close) many forms on one line.  This generally puts the cursor
where it should be, though it is probably confused by strings
with brackets and things.
 2018-09-29 11:25:11 +01:00
Dheepak Krishnamurthy
1549c18b8e Add single_string highlighter 2018-09-28 03:41:10 -06:00
Maxime Coste
004ed72f44 Merge remote-tracking branch 'laelath/kitty-qol-commands' 2018-09-27 19:08:47 +10:00
Maxime Coste
6a82398d0f Merge remote-tracking branch 'schickm/hbs-highlighter-refactor' 2018-09-27 19:08:09 +10:00
Maxime Coste
f3d6586df2 Merge remote-tracking branch 'laelath/clang-format-fixes' 2018-09-27 18:55:50 +10:00
Justin Frank
7e15f200b1 Fixed several clang output formatting errors 2018-09-26 11:22:30 -07:00
Matt Schick
e7e87db94e Rework the handlebars highlighter 
- Removes -recurse from handlebars comments. Handlebars parsers (janl/mustache.js, ember-cli/ember-cli-htmlbars), do not treat comments as recursive, so don't highlight them as so.
- Creates shared/hbs-file highligher group. This represents a handlebars file, which is html that happens to contain some handlebars tags.
- Augments the shared/html highlighter when needed. Because handlebars lives inside of html, we need to add the highlighter inside of it. Since there's no way to scope modifications of a shared highlighter to a window, here I'm modifying/unmodifying the shared/html highlighter whenever the user attaches/detaches a filetype of "hbs" to/from the window.
- Matches namespaced helpers as well. In htmlbars, helpers (components) can have '/'s in them, so make sure to continue highlighting through those. Also removes unused capturing groups.
- Allows for de-indenting when closing a block expression
- Brings in html highlighter hooks
- Improves indent matching on close of yielded blocks. Previous version just flat out didn't work.
 2018-09-26 06:12:24 -05:00
Andrey Orst
ab09864bd5
Update c-family.kak 2018-09-25 10:23:07 +03:00
Justin Frank
d06e8d662d Added focus-tab call to kitty-focus 2018-09-23 21:12:07 -07:00
Justin Frank
903ae46b5d Added more kitty integration 2018-09-23 13:15:29 -07:00
Maxime Coste
09546a950e doc.kak: Fix rendering of indented code blocks 
Fixes #2376
 2018-09-23 22:42:30 +10:00
Maxime Coste
dbfed1306f git.kak: Refactor commit message highlighting 
Use regions to avoid highlighting the commit message as a diff.
The new method will fail if one line of the commit message matches
'^diff --git' but that is fairly unlikely.

Fixes #2371
 2018-09-23 18:00:51 +10:00
Maxime Coste
bb1cb0dbf1 doc.kak: Tweak paragraph joining logic 
Fixes #2378
 2018-09-23 17:40:16 +10:00
Maxime Coste
49645f8efc Merge remote-tracking branch 'laelath/spell-clear' 2018-09-23 17:05:51 +10:00
Jason Felice
538f2a74c7 Fix clojure numbers 
- Fix issue where numbers which were part of symbols were highlighted.
- Fix issue where hexidecimals weren't highlighted past the 'x'
 2018-09-22 16:16:36 -04:00
Justin Frank
5700587926 added spell-clear convenience command 2018-09-21 12:30:13 -07:00
Maxime Coste
fd107b8b5e Merge remote-tracking branch 'Delapouite/remove-hooks' 2018-09-20 21:14:22 +10:00
Maxime Coste
8618b286c5 Merge remote-tracking branch 'laelath/highlighter-fixes' 2018-09-20 21:14:01 +10:00