xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,970 Commits 1 Branch 0 Tags 17 MiB
1e597eb010
Commit Graph

2572 Commits

Author SHA1 Message Date
Isa Cichon
0fc91b9576 Fix usages of ModeChange hook 
hook param always begins with either push: or pop:

Fixes #4078
 2021-02-28 21:07:21 +01:00
Michał Kruszewski
b7def7350c Add comment highlighter for troff files. 
Add comment highlighter for troff files.
Also highlight the end of the macro definition.
 2021-02-25 20:18:10 +01:00
Maxime Coste
726b96da69 Merge remote-tracking branch 'forbesmyester/master' 2021-02-25 20:24:54 +11:00
Maxime Coste
70548ecc14 Merge remote-tracking branch 'rwpeterson/juliahl' 2021-02-25 20:23:10 +11:00
Maxime Coste
84211d2b60 Merge branch 'add-comment-chars-for-scheme' of https://github.com/Calum-J-I/kakoune 2021-02-25 20:22:02 +11:00
Maxime Coste
475e1ccf28 Merge commit 'refs/pull/4047/head' of https://github.com/mawww/kakoune 2021-02-25 20:20:25 +11:00
Bob Peterson
c457c2b1c1 rc julia: add multiline comments 2021-02-21 19:20:03 +01:00
Calum
3e456ae34e use lisp comments for scheme 2021-02-22 01:21:04 +13:00
Ivan Tham
4e594e034a Dedent rust await function with ? 2021-02-17 01:17:17 +08:00
Ivan Tham
049591f6b4 Dedent rust empty match 2021-02-17 01:17:14 +08:00
Maxime Coste
dea44e4964 Merge remote-tracking branch 'lenormf/fix-spell' 2021-02-11 20:40:50 +11:00
Maxime Coste
fb30d3751c Merge remote-tracking branch 'krobelus/yaml-comment' 2021-02-11 20:30:34 +11:00
Maxime Coste
1440db3f89 Merge remote-tracking branch 'krobelus/rest-leaked-code-highlighting' 2021-02-11 20:29:43 +11:00
Johannes Altmanninger
7ddaf071c7 rc java: highlight byte/short/long primitive types 2021-02-10 21:09:30 +01:00
Johannes Altmanninger
41059b3f0c rc yaml: "#" inside a word is not a comment 2021-02-10 21:09:25 +01:00
Johannes Altmanninger
cfae4dda91 rc restructuredtext: don't highlight first character of next line as code 
Reproduce by creating a *.rst buffer with the text below. The "N" used to
be highlighted as code.

::

    code

Not code
 2021-02-10 21:09:16 +01:00
Matthew Forrester
e1db59fb8d rc repl x11: do not send new line 
The X11 repl is unique in that it sends the selection (or parameter) with a
new line appended.

This patch removes that new line and thus, brings it into line with the tmux
and kitty versions.
 2021-02-05 06:04:16 +00:00
Samadi van Koten
057c532ba8 Fix editorconfig incorrectly matching properties with prefixes 2021-02-04 08:40:22 +00:00
Maxime Coste
5eb2be3e6b Merge remote-tracking branch 'kayhide/kitty-listen-on' 2021-01-28 21:07:16 +11:00
Maxime Coste
8738be1252 Merge branch 'master' of http://github.com/Kabouik/kakoune 2021-01-28 21:06:14 +11:00
Maxime Coste
69f1c8cae5 Merge remote-tracking branch 'Ordoviz/markdown' 2021-01-28 21:02:47 +11:00
Maxime Coste
b8f1df6458 Fix man for systems lacking the col command 
At least Alpine linux with mandoc does not have the col command,
as it is easy to emulate with sed, fallback onto it when it does
not exist.
 2021-01-26 09:28:24 +11:00
Hideaki Kawai
52222a52e4 Support KITTY_LISTEN_ON on kitty-terminal-tab and kitty-focus 2021-01-22 09:19:35 +09:00
Hideaki Kawai
38b914162a
Update rc/windowing/kitty.kak 
Co-authored-by: Screwtapello <thristian@gmail.com>
 2021-01-22 08:41:41 +09:00
Mathieu Laparie
0a978865f4 Add comment symbols for r filetypes, remove rmd for now 2021-01-21 15:35:35 +01:00
Mathieu Laparie
b74dfa1e74 Add R and Rmd options for comment.kak 2021-01-21 15:12:41 +01:00
Hideaki Kawai
0917191118 Respect KITTY_LISTEN_ON when launching terminal 2021-01-21 18:58:48 +09:00
Lennard Hofmann
61fabee03f rc markdown: Highlight HTML tags 2021-01-19 15:42:37 +01:00
Frank LENORMAND
efb6fca068 rc spell: Remove :spell-replace default value 
This commit removes the default prompt value from the `spell-replace`
command.

Currently, running the command after selecting a misspelled word
might not allow the editor to propose alternative spellings because
it completes upon whatever is inserted into the prompt. If the words
returned by `aspell` are too different from the currently misspelled
word, no candidates are shown.

For example, selecting “unanymously” and running `:spell-replace`
will not show any candidates under the current implementation (the
‘y’ probably trips the fuzzy-matcher).

The user develops a habit of clearing the prompt every time, because
that's the only way to make sure all suggestions from `aspell` are
visible, so the editor might as well not have any default value for
`:spell-replace`.
 2021-01-19 16:38:23 +03:00
Maxime Coste
3bb576edde Merge branch 'patch-1' of http://github.com/jhalmen/kakoune 2021-01-19 20:56:33 +11:00
Maxime Coste
52ab656fc1 Merge remote-tracking branch 'forbesmyester/master' 2021-01-19 20:56:14 +11:00
Maxime Coste
2578759252 Merge remote-tracking branch 'chambln/pfm' 2021-01-19 20:55:03 +11:00
Maxime Coste
86997bfa09 Merge remote-tracking branch 'SeerLite/js-multiline-division' 2021-01-19 20:54:32 +11:00
Maxime Coste
5b7048dc34 Merge remote-tracking branch 'ifreund/meson-fix' 2021-01-19 20:54:25 +11:00
Isaac Freund
033b55c3ac
zig.kak: fix highlighting of empty doc comment 
If a line contains three slashes directly followed by a new line, the
next line is also erroneously highlighted as a doc comment currently.
Using a lookahead instead fixes this.
 2021-01-18 00:44:32 +01:00
Matthew Forrester
c9d50660f1 rc repl x11: allow arg for repl send & refocus kak 
tmux-send-text allows sending an argument, when supplied the argument
will be sent to the REPL instead of the current selection.

tmux-send-text also keeps kak focussed, which does not happen in the x11
variant as it uses xdotool to switch window.

this patch allows:

 * Passing an argument to x11-send-text, so that value will be sent
 instead of the current selection.
 * We capture the window id of the current (presumably kak window)
 before we use xdotool to switch window. We can therefore switch back to
 kak afterwards (which we do)
 2021-01-16 15:57:32 +00:00
Gianni Chiappetta
fe3f8d2271
chore(rc): support nested field strings in graphql 2021-01-14 15:46:50 -05:00
Gianni Chiappetta
69a152d680
chore(rc): change graphql block delimiters to support better regexs 2021-01-14 11:40:17 -05:00
Gianni Chiappetta
ec80d83e71
feat(rc): improve graphql field arguments highlighter 2021-01-13 21:37:08 -05:00
Gianni Chiappetta
d8f65bd0ec
feat(rc): match .graphqls file extension as graphql filetype 2021-01-13 21:31:29 -05:00
Gianni Chiappetta
1c639f7810
feat(rc): improve graphql syntax highlighters 2021-01-13 21:29:03 -05:00
Isaac Freund
233b990275
meson: improve highlighting, add static words 
Now all functions are highlighted and builtins are highlighted
with their own face.
 2021-01-13 15:44:38 +01:00
jhalmen
33f44f6abc
editorconfig: fix trim_trailing_whitespace 
also trim all superfluous newlines at end-of-file if `trim_trailing_whitespace` is set
 2021-01-12 15:45:39 +01:00
SeerLite
569267b18d rc js: Correctly highlight multiline division. 2021-01-11 13:06:38 -03:00
Gregory Chamberlain
a49b1c4996 Adjust markdown code fences filetype regex 
This highlighter (line 50 of markdown.kak) looks for the filetype
specified by the author at the top of the code fence, e.g.

``` python
print("hello")
```

and highlights the code within using Kakoune's relevant highlighter --
in this case Python.

Some flavours of markdown use curly braces and other characters in the
first line such as the following:

``` {=python}
print("hello")
```

Previously Kakoune recognised `{=python}` but not `{.python}`.  The latter
is Pandoc's flavour of markdown.  This patch adjusts the regex patterns
to recognise the dot notation as well.
 2021-01-08 10:24:04 +00:00
Lennard Hofmann
f65d5210f8 rc markdown: Prevent underscores in URLs cause italic highlighting 
Create regions to achieve that. Add support for inline links.
 2021-01-05 18:51:37 +01:00
Maxime Coste
183bb660b7 Merge branch 'patch-5' of http://github.com/co-dh/kakoune 2021-01-04 09:44:58 +11:00
Maxime Coste
083fcff9fa Merge remote-tracking branch 'harryoooooooooo/tmux-focus' 2021-01-03 11:35:47 +11:00
Maxime Coste
c8378eb7f2 Merge remote-tracking branch 'Ordoviz/pascal' 2021-01-03 11:28:11 +11:00
Hao Deng
d6c96dc456
Update tmux.kak 
When $1 or ${kak_selection} start with dash, like "-1", the command will fail, because tmux think it's an argument flag.
-- prevent this.
Also the doc (append new line) is no longer valid.
 2020-12-30 16:11:02 -05:00
Lennard Hofmann
3eabeac3c9 Add Pascal/Delphi language support 2020-12-29 12:20:33 +01:00
harryoooooooooo
96df051ea3 tmux-focus: Add support for focusing a client on another window. 2020-12-28 23:04:00 +08:00
codesoap
c9f07702f9 file.kak: Acknowledge mime type application/x-shellscript 2020-12-23 22:45:07 +01:00
Maxime Coste
74b6c20a0d Merge remote-tracking branch 'pickfire/rust-indent-bracket' 2020-12-21 09:00:35 +11:00
Maxime Coste
a0f575a0f7 Merge remote-tracking branch 'tototest99/ml_v_comments' 2020-12-21 08:59:14 +11:00
Maxime Coste
45d0d0cfdc Merge remote-tracking branch 'lenormf/patch-13' 2020-12-21 08:58:02 +11:00
Maxime Coste
ec41a93c35 Merge remote-tracking branch 'greneholt/ruby-syntax' 2020-12-21 08:55:56 +11:00
Maxime Coste
c99731ebf1 Use stderr/fail to return errors in modeline.kak 2020-12-20 11:30:32 +11:00
antab
6523f57d72 feat(comment.kak): add OCaml and Coq cases 2020-12-18 08:08:56 +01:00
Frank LENORMAND
deff6b2fa9
rc doc: Hide private commands 2020-12-17 16:43:48 +03:00
Ivan Tham
1965b909e1 Rust dedent after .await 2020-12-17 20:07:44 +08:00
Ivan Tham
ffbdcaa95c Rust handle [ indent like { and ( 2020-12-17 11:19:23 +08:00
David Arnold
38efe8b421
Fix protobuf commenter 2020-12-13 20:15:02 -05:00
Maxime Coste
ce97c0dd17 Merge remote-tracking branch 'lenormf/fix-temporary-dir-template' 2020-12-05 10:53:57 +11:00
Maxime Coste
fd95e91770 Merge remote-tracking branch 'lenormf/fix-3681' 2020-12-05 10:53:08 +11:00
Maxime Coste
5849b860bd Merge remote-tracking branch 'ifreund/zig-syntax' 2020-12-05 10:50:05 +11:00
Frank LENORMAND
a548caaebe rc: Consistently use a dot as template separator 
Other scripts uses a dot `.` to separate the seed from the rest of
the template, making that standard across the codebase allows running
cleanup commands like `rm -rf /tmp/kak-*.*`.
 2020-11-30 14:24:06 +03:00
Frank LENORMAND
fe5f357446 rc lint: Avoid stray processes and temporary directory 
This commit is an attempt at mitigating stray processes and temporary
directories, which pile up in the process tree and `$TMPDIR` over time.

To reproduce the issue, run the `lint` command in rapid successions,
or simply run `:lint; lint; lint;` in the prompt (two consecutive
calls are enough to trigger the bug).

The first call creates a `\*lint-ouput*` buffer, bound to a named
pipe that will be populated later on in an asychronous shell
process. It's that same process that runs the linter afterward, and as
soon as it has been spawned, the following call to `:lint` is executed.

Each call to `:lint` overrides the path to the named pipe that was
assigned to `\*lint-output*` by the previous one, resulting in several
asynchronous processes (that write diagnostics to the pipe) hanging
forever — the pipe is never read, and so the process idles.

The command that removes the temporary directory follows the one that
writes to the named pipe, it's never called in the above scenario,
which additionally results in `kak-lint.XXXXXXXX` directories being
left behind in `$TMPDIR`.

(Also) Fixes #3681.
 2020-11-30 13:51:34 +03:00
Isaac Freund
698b028f83
zig: highlight escapes in strings, update to 0.7.0 2020-11-23 19:03:53 +01:00
Michał Kruszewski
4cb9a46f2b Python: change face for documentation to documentation. 2020-11-23 07:31:56 +01:00
Maxime Coste
14f7d2637c Fix test and re-add triple_string support in python highlighting 
Triple strings are now distinct from docstrings, triple strings
only preceeded by blanks on the line are considered docstrings.

Avoid highlighting of the closing marker using a lookahead, this
is not fully correct as it will break on a double quote triple
docstring containing a single quote triple string but that seems
improbable enough; if we encounter this in the wild we can split
the two docstring formats into separate regions.
 2020-11-23 08:45:59 +11:00
Maxime Coste
024e0a04f2 Merge remote-tracking branch 'm-kru/python_docstring_comment' 2020-11-22 17:02:31 +11:00
Maxime Coste
f97a4be330 Merge remote-tracking branch 'lenormf/organise-kakrc-keywords' 2020-11-22 16:56:53 +11:00
Maxime Coste
a449bcb62f Merge remote-tracking branch 'm-kru/vhdl_filetype_fix' 2020-11-22 16:55:52 +11:00
Michał Kruszewski
fd047e332f Python: Highlight docstrings with documentation face, not string. 2020-11-20 15:33:22 +01:00
connor
8b0fe9cfb0 Avoid recognizing remainder division as a percent string 2020-11-18 16:26:33 -07:00
Reed Wade
36631fc473
Detect filetype on buffer save too 
This allow kaking a new file, add a shebang in the first line, and get
the right filetype detected automatically on save.
 2020-11-17 22:32:09 +01:00
Frank LENORMAND
9237fc0388 rc kakrc: Add the rename-buffer keyword 2020-11-17 15:58:58 +03:00
Frank LENORMAND
8a1ac1998d rc kakrc: Add the arrange-buffers keyword 2020-11-17 15:52:18 +03:00
Frank LENORMAND
f4a387dd10 rc kakrc: Sort the keywords 2020-11-17 15:51:30 +03:00
Maxime Coste
cdcf4b0c7d Merge remote-tracking branch 'JJK96/svelte' 2020-11-17 07:19:13 +11:00
Maxime Coste
129af8dd11 Merge remote-tracking branch 'eraserhd/graphql' 2020-11-17 07:19:01 +11:00
Lennard Hofmann
8972f77f78 sh.kak: Highlight special parameters, e.g. $@, in double quotes 2020-11-14 13:53:52 +01:00
Lennard Hofmann
00857eaadc sh.kak: Do not treat bitwise operator << as here-document start 2020-11-14 11:29:32 +01:00
Jan-Jaap Korpershoek
a84fe437fa Improve svelte highlighter 2020-11-13 00:21:05 +01:00
Jason Felice
05e02e38e3 rc: add graphql filetype 2020-11-11 11:54:25 -05:00
Maxime Coste
27e95ed657 Merge remote-tracking branch 'tototest99/ninjafile' into master 2020-11-11 07:37:30 +11:00
Maxime Coste
d495369e75 Merge remote-tracking branch 'ManDay/master' into master 2020-11-11 07:25:54 +11:00
Maxime Coste
dacaad4e93 Merge remote-tracking branch 'lenormf/fix-markdown_bullet_indented' into master 2020-11-10 19:04:36 +11:00
Maxime Coste
5d81be40cf Merge remote-tracking branch 'JJK96/svelte' into master 2020-11-10 19:03:40 +11:00
Frank LENORMAND
ae9088f192 rc markdown: Fix bullet highlighting 
This commit prevents the lines following the one that holds the bullet
from being highlighted with the `bullet` face when they're indented:

- The bullet is highlighted properly, so is this sentence
  but this line the ones that would follow are not

Fixes #3582
 2020-11-10 08:44:17 +03:00
Jan-Jaap Korpershoek
93e85bebbb Don't use hook_param_capture_1 2020-11-09 09:53:10 +01:00
antab
858650ea57 refactor(ninjafile): simplify ninja.kak and fix few things 
* fix multilines for declarations
* fix names with `-`, which Ninja allows
* fix few cases of `=` operators
* fix reserved keywords in `command = …` right-hand side

Co-authored-by: Frank LENORMAND <1379068+lenormf@users.noreply.github.com>
 2020-11-08 14:13:45 +01:00
Johannes Altmanninger
cc9447c15b rc perl.kak: highlight substitution with empty replacement, like s{foo}{} 2020-11-08 06:16:27 +01:00
Johannes Altmanninger
1f4362d0ba rc perl.kak: highlight multiple regex modifiers 2020-11-08 06:16:27 +01:00
Maxime Coste
ba02c1d822 Merge remote-tracking branch 'eraserhd/nix-dash-in-word' into master 2020-11-08 15:19:20 +11:00
Maxime Coste
06b082da54 Merge remote-tracking branch 'krobelus/extra-hook-for-fish-insert' into master 2020-11-08 15:18:23 +11:00
Maxime Coste
2e7d93b2f4 Merge remote-tracking branch 'krobelus/ruby-heredoc' into master 2020-11-08 15:17:37 +11:00
Maxime Coste
086771593c Fix regex error in perl highlighting 2020-11-08 15:14:07 +11:00
Maxime Coste
7832632d02 Merge remote-tracking branch 'krobelus/perl-quoted-heredocs' into master 2020-11-08 15:07:58 +11:00
Maxime Coste
04bd899959 Merge remote-tracking branch 'krobelus/git-indented-comment' into master 2020-11-08 15:07:15 +11:00
Maxime Coste
ba015a2263 Merge remote-tracking branch 'lenormf/kakrc-highlight-numbers' into master 2020-11-08 15:05:12 +11:00
Maxime Coste
1a64a0d601 Merge remote-tracking branch 'lenormf/kakrc-highlight-str-maps' into master 2020-11-08 15:04:45 +11:00
Maxime Coste
920d1333bd Merge branch 'master' of http://github.com/tgirod/kakoune into master 2020-11-08 15:00:26 +11:00
Maxime Coste
fdd6411e69 Merge remote-tracking branch 'lenormf/fix-markdown_inline_code_blocks' into master 2020-11-08 14:57:50 +11:00
Maxime Coste
6cf3c13d97 Merge remote-tracking branch 'listentolist/tmux-repl' into master 2020-11-08 14:53:38 +11:00
Maxime Coste
19c0054e60 Merge remote-tracking branch 'npatsakula/spell_fix' into master 2020-11-08 14:50:25 +11:00
Maxime Coste
d1c27ad126 Merge remote-tracking branch 'occivink/c-alt-absolute' into master 2020-11-08 14:48:42 +11:00
Maxime Coste
e17f348a84 Merge remote-tracking branch 'Carsenal/javascript_regex_parsing' into master 2020-11-08 14:47:10 +11:00
Maxime Coste
2a5628659a Merge remote-tracking branch 'pickfire/profile' into master 2020-11-08 14:33:02 +11:00
Patsakula Nikita
ff8d4d6567
[-] spell.kak: undocumented aspell buggy-behavior avoided. 2020-11-06 15:41:12 +03:00
Olivier Perret
7e736289ce c-family: allow specifying absolute alt directory paths 
alt-dirs which start with a / are considered to be absolute
 2020-11-05 16:56:41 +01:00
Carson Riker
366d6fe759 Check for division before we check for regexes 2020-11-04 10:01:56 -05:00
Michał Kruszewski
f4f97835f9 VHDL filetype: fix auto inserting when indentation is mixed. 2020-11-03 19:35:05 +01:00
Maxime Coste
42301f32ca doc.kak: Render links and other elements with a single ranges highlighter 2020-11-02 08:51:44 +11:00
Ivan Tham
1e2458772d Highlight ~/.profile too 2020-11-01 17:00:12 +08:00
Maxime Coste
5d6136483c Merge remote-tracking branch 'listentolist/x11-repl' into master 2020-11-01 10:10:39 +11:00
Jan-Jaap Korpershoek
bbdcc5fdec Add very basic svelte support 2020-10-30 16:29:32 +01:00
Tilman List
d545d2c181 if the $WINDOWID is not set, use xdotool to get the window id 2020-10-30 14:35:20 +01:00
Tilman List
a5dbeeb5ee simplify x11-repl by using x11-terminal 2020-10-30 12:19:53 +01:00
tgirod
f21867d2ac
fix comment highlighting 
`#` will be considered a comment only if it is the first character of the line, including blank characters.
 2020-10-28 09:36:28 +01:00
Tilman List
9955cfdd8d changed scope of tmux_repl_id from global to current 
By setting the tmux_repl_id in the `current` scope it is possible to have
different REPLs for different buffers or windows.
 2020-10-27 17:20:33 +01:00
Tilman List
de6e86da46 changed the way the x11 REPL interaction works 
Now it uses the window id to identify the REPL window. It is stored in
the option x11_repl_id. That way it is possible to have different REPLs
for different buffers or windows.
 2020-10-27 14:26:27 +01:00
Cedric Sodhi
221fc38bd9 Disabled backtick escaping 
Fixes issue #2377 by removing the ability to escape backticks in backticks in compliance with asciidoc's behaviour. Adjusted hooks.asciidoc, keys.asciidoc, and command-parsing.asciidoc to match accordingly.
 2020-10-27 12:36:33 +01:00
Maxime Coste
90043e7df0 Replace write -atomic with write -method <method> 
`-atomic` becomes `-method replace` and `-method overwrite` is now
supported explicitely instead of only available through the
writemethod option.

Fixes #3827
 2020-10-27 20:20:18 +11:00
Frank LENORMAND
f8a2176ed1 rc markdown: Highlight inline code blocks properly 
This commit allows code blocks to be prefixed with tabulation
characters to be picked up and highlighted by the editor.

Indenting caused by the inclusion of an inline code block into a
list item is also taken into account. However, that might cause false
positives, for example with a hard wrapped list item indented with
an amount of spaces congruent to 4.
 2020-10-23 16:35:01 +03:00
Frank LENORMAND
b36f7b8440 rc kakrc: Highlight numbers 2020-10-23 14:31:38 +03:00
Frank LENORMAND
72e2b4a9be rc kakrc: Highlight str-to-str-map types 2020-10-23 14:28:43 +03:00
Johannes Altmanninger
637153270f rc git: indented # is not a comment in commit message 
Git includes them in commit messages and notes, which is sometimes useful
when adding shell script snippets:

    # this is included in the commit message!

Also, in rebase buffers, # only marks a comment if it is the first nonblank
character in a line.
 2020-10-21 22:08:35 +02:00
Johannes Altmanninger
816bdc91f6 rc fish.kak: split fish-insert hook out from fish-indent 
Same as in sh.kak; this allows to only disable the insert hook using
%opt{disabled_hooks}.
 2020-10-19 19:01:17 +02:00
Johannes Altmanninger
335ee743a4 Fix overzealous closing of ruby heredocs 
Fixes #2516
 2020-10-19 19:01:17 +02:00
Johannes Altmanninger
19391f8c02 rc perl: quoted heredocs can be empty 
Also the closing line cannot have any trailing characters.
Leading tabs are allowed if <<~ is used.
 2020-10-19 19:01:17 +02:00
Jason Felice
b6df40c586 rc nix: dash in extra_word_chars 2020-10-19 11:53:08 -04:00
Maxime Coste
296937a2a2 Merge remote-tracking branch 'Carsenal/perl_regex_highlighters' into master 2020-10-19 20:23:57 +11:00
Maxime Coste
a716923546 Merge remote-tracking branch 'SeerLite/markdown-raw-attributes' into master 2020-10-19 20:23:11 +11:00
Maxime Coste
8153f34a04 Merge remote-tracking branch 'voroskoi/gopls-fix' into master 2020-10-19 20:09:31 +11:00
Maxime Coste
2f8e8e542a Merge remote-tracking branch 'johnisom/sql-highlighting' into master 2020-10-19 20:08:50 +11:00
Maxime Coste
61f08e84f8 Merge remote-tracking branch 'eraserhd/nix-dash-fix' into master 2020-10-19 20:08:18 +11:00
voroskoi
dd6a275c3e
gopls.kak: use nop for removing temp dir 
Co-authored-by: Frank LENORMAND <1379068+lenormf@users.noreply.github.com>
 2020-10-17 09:47:07 +02:00
VÖRÖSKŐI András
cbbab07aab gopls: Fix format/imports error reporting 
Remove unnecessary single quotes and whitespaces in %file{}
Do not delete error file before sending to debug buffer
Fix gopls definition error handling and empty sting check
Silence shellcheck warnings
 2020-10-16 22:40:58 +02:00
Michał Kruszewski
4aabe33a24 Add support for VHDL filetype. 2020-10-15 09:21:04 +02:00
John Isom
860e8d55eb Fix function highlighting by adding lazy instead of greedy regexp quantifier 2020-10-14 14:54:43 -06:00
Jason Felice
c1f67972e4 rc nix: handle dashes embedded in identifiers 
Some experimentation at the REPL showed that any number of leading dashes
are operators, while embedded dashes are identifier characters.

Closes #3803.
 2020-10-14 07:55:06 -04:00
Maxime Coste
1de058cdf8 Fix rust highlighting after regions highlighter behaviour change 2020-10-12 13:04:08 +11:00
SeerLite
a06dcf8c10 markdown.kak: Support pandoc's raw_attribute 2020-10-11 20:53:39 -03:00
Carson Riker
21fbda7c68 Fixed ending of region, as per @krobelus 2020-10-09 13:25:26 -04:00
Carson Riker
30d5aa203d Added highlighted for curly-brace based sregexes 2020-10-09 10:45:42 -04:00
Maxime Coste
600be827b3 Merge remote-tracking branch 'pickfire/indent-yaml' into master 2020-10-08 19:51:05 +11:00
Maxime Coste
7fefb206dc Merge remote-tracking branch 'SeerLite/lua-fixes' into master 2020-10-08 19:50:41 +11:00
Ivan Tham
c148fdbe9a Rust always indent after { 2020-10-04 23:40:49 +08:00
Ivan Tham
b0ae30a443 Add missing rust indent after function { 2020-10-04 14:19:33 +08:00
SeerLite
3c3a4ec985 lua.kak: Correct -trim-indent hook and fix indent 2020-10-03 16:38:43 -03:00
Ivan Tham
1809035c15 Yaml indent after - 2020-10-02 14:24:04 +08:00
Maxime Coste
9401a9fd25 Merge remote-tracking branch 'Screwtapello/extensible-docs' into master 2020-10-01 22:16:23 +10:00
Maxime Coste
fcabffefe1 Merge remote-tracking branch 'pickfire/rust-indent' into master 2020-10-01 19:07:05 +10:00
Maxime Coste
88f6b65f35 Merge remote-tracking branch 'lboklin/master' into master 2020-09-30 21:29:38 +10:00
Maxime Coste
c9b4b0e355 Merge remote-tracking branch 'tototest99/ninjafile-upd' into master 2020-09-30 19:43:11 +10:00
Ivan Tham
bfca07da4d Rust not to indent on hash 2020-09-30 00:37:35 +08:00
Ivan Tham
56e12013c8 Rust indent keyword check boundary 2020-09-28 00:09:12 +08:00
Ivan Tham
df68a77ed2 Rust reindent where to match block 2020-09-28 00:03:53 +08:00
Ivan Tham
785cbaeaed Add rust test for empty line indent 2020-09-27 23:34:08 +08:00
Ivan Tham
5c8dfcdfa9 Rust improve align after partial statement 2020-09-27 15:53:15 +08:00
Ivan Tham
11d98a07dc Rust align open paren for if and for 2020-09-27 15:52:42 +08:00
Simon Fowler
83277d5545 Improve shell indentation implementation. 
Use the custom object match command for copying indentation of blocks,
rather than simply increasing/decreasing indentation when start and end
statements are encountered.

This fixes an issue where a newline added after an already correctly
placed `else` or `fi` would trigger an unnecessary deindent. Tests have
been added to ensure no regression in this behaviour.
 2020-09-26 22:10:31 +10:00
antab
737134b993 fix: improve regex for build region 2020-09-22 13:49:11 +02:00
Maxime Coste
dd1a582b30 Merge branch 'patch-3' of http://github.com/blaggacao/kakoune into master 2020-09-22 21:28:41 +10:00
Maxime Coste
c6bfce0350 Merge remote-tracking branch 'Screwtapello/spell-replace-prompt' into master 2020-09-22 21:26:22 +10:00
Maxime Coste
fa375d1c46 Merge remote-tracking branch 'krobelus/dont-highlight-escaped-expansion' into master 2020-09-22 21:23:00 +10:00
Maxime Coste
154e11181f Merge remote-tracking branch 'krobelus/perl-quoting' into master 2020-09-22 21:20:14 +10:00
Maxime Coste
57208a5481 Merge remote-tracking branch 'm-kru/go_kak_fix' into master 2020-09-22 21:18:52 +10:00
David Arnold
0d476aaa95
just: highlight function expressions 2020-09-22 00:24:29 -05:00
Tim Allen
93e5a3b51f spell.kak: Replace "kak -f" with "sed" for efficiency. 2020-09-22 01:29:03 +10:00
antab
d0ee3dfe94 fix: add subninja and include to static_words 2020-09-21 13:41:19 +02:00
antab
d5ccdcfed4 fix(ninja filetype): add subninja and include declarations and fix builddir highlights 2020-09-21 13:34:27 +02:00
Tim Allen
f75f484b84 spell.kak: Present spelling suggestions with :prompt 
Previously, spelling suggestions were presented with the :menu command,
requiring the user to cycle through wild and fanciful alternatives to get to the
one they wanted. Now, we present suggestions with the :prompt command, which
allows the user to type to filter down the list, and also to customise the
replacement after they've chose it (perhaps to fix capitalisation or add
apostrophe-S).

We also use the mispelled word as the initial content of the prompt. That
filters out the wildest alternatives by default, and allows the user to edit the
original word instead of forcing them to choose from among the suggestions. To
get the full list of suggestions, it's easy enough to just backspace until the
word you want appears in the list.
 2020-09-21 21:07:35 +10:00
Michał Kruszewski
f78cd6daf8 Improve '}' auto inserting for go language. 
Adding "} else if ... {" was not correctly handled.
 2020-09-20 12:25:26 +02:00
Johannes Altmanninger
50775b26e4 *sh.kak: do not highlight expansions if their $ is escaped 2020-09-19 08:06:46 +02:00
Johannes Altmanninger
19b54a8a6e Highlight more Perl quoting syntaxes 
This adds highlighting for

- quoting operators qw, qr, and qx, like `qw< some words >`
- angle brackets after a quoting operator, like `q<string>`
- punctuation as quoting delimiter, like `q|string|`
- POD sections, which start with ^=\w and and with ^=cut
- heredocs; the marker can be a bare word, or a quoted word, like

	print <<~ 'EOF'
		single quoted heredoc
	EOF

Closes #3736

No attempt is made to use different highlighting for interpolated (qq or
"") strings just yet. Recognizing quote boundaries is more important.
 2020-09-18 20:55:12 +02:00
Frank LENORMAND
4025ac8167 rc modeline: Print the final command directly 2020-09-18 15:12:13 +03:00
Frank LENORMAND
2a51ebf105 rc modeline: Factorise the use of kakquote 2020-09-18 15:12:13 +03:00
Frank LENORMAND
2d78b0760d rc modeline: Error out on unsupported formats 
This commit makes `:modeline-parse` grab all lines that look like
modelines, and lets the parser deal with invalid formats.

This allows actually printing an error on unsupported modelines
formats, instead of ignoring them upfront.
 2020-09-18 14:54:57 +03:00
Frank LENORMAND
30ee97386d rc modeline: Use more idiomatic shell 2020-09-18 14:54:57 +03:00
Frank LENORMAND
7731fe4cb2 rc modeline: Print error messages correctly 2020-09-18 09:01:32 +03:00
Frank LENORMAND
6976b1dce4 rc modeline: Prevent command execution 
This commit prevents specially crafted modelines from making the
editor execute arbitrary Kakoune commands.

By using a tabulation character as a separator, commands can be
injected in the value of the options listed in the modeline. For
example:

	# kak: tabstop=2;set-option	buffer	pwned	yes

Fixes #3735.
 2020-09-18 09:01:32 +03:00
Maxime Coste
dbd7e4da79 Merge remote-tracking branch 'voroskoi/gopls' into master 2020-09-17 19:49:33 +10:00
Maxime Coste
fd658f6995 Merge remote-tracking branch 'lenormf/fix-3733' into master 2020-09-17 19:39:48 +10:00
Maxime Coste
b8f56a65ed Merge remote-tracking branch 'deviant/add-go-alternative-file' into master 2020-09-17 19:38:59 +10:00
Maxime Coste
cb047a4a7d Merge remote-tracking branch 'tototest99/ninja-syntax' into master 2020-09-17 19:34:54 +10:00
Maxime Coste
81163ce48a Merge remote-tracking branch 'Aajn/python-highlighter' into master 2020-09-17 19:33:51 +10:00
VÖRÖSKŐI András
9fe1a2a9a4 gopls: fixes based on krobelus@ review 2020-09-16 21:58:22 +02:00
antab
810689ad60 fix: variables adjacent to = and in build declaration 2020-09-16 21:09:27 +02:00
Frank LENORMAND
95c095f3fb rc modeline: Don't select more lines than configured 
This commit addresses an off-by-one error that selected `modelines`+1
lines when looking for modelines in a buffer.

Note that setting `modelines` to 0 will still select one line.

Fixes #3733.
 2020-09-16 11:00:15 +03:00
antab
ea4f2b8837 feat: add basic ninjafile support 2020-09-16 00:03:17 +02:00
David Arnold
1ff9895fe4 just: re-implment bash/sh interpreter 2020-09-15 16:32:07 -05:00
David Arnold
3857696df6
just-highlighter: pre call out to shebang regions 2020-09-15 16:10:40 -05:00
David Arnold
3770baaab0 fix justfile highlighter 
This fixes serveral shortcomings of the current implementation:

- valid recipt definitions eg
foo bar="quz":
where previously interrupted by justfile/double_string
and therefore they where not highlighted correctly

- global variable assignments where not captured at all
 2020-09-15 15:52:00 -05:00
Piotr Chrominski
bfbf4d2080 Fix python docstring highlighter 
Escaped ' or " at the end of a docstring no longer break highlighting.
 2020-09-15 22:01:55 +02:00
VÖRÖSKŐI András
2b18b1d088 rc/go-tools.kak: remove 
Working functions replaced by gopls
Use kak-lsp if you need in place documentation and autocompletion
 2020-09-15 01:02:19 +02:00
VÖRÖSKŐI András
568020d67b rc gopls.kak: initial import 
Add support for the following gopls commands:
 - format
 - imports
 - definition
 - references

Thanks krobelus@ and lenormf@ for their review and suggestions.
 2020-09-15 01:01:35 +02:00
V
c6b7e3d74a Add :alt command for go files 2020-09-10 00:23:46 +02:00
Maxime Coste
6f260c2ab2 Merge remote-tracking branch 'm-kru/latex' into master 2020-09-08 19:06:56 +10:00
Michał Kruszewski
0f63dd339a Provide better support for Go language. 
1. Highlight short variable declaration operator :=.
2. 'while' is not go keyword.
3. Auto insert ')', '}', when line ends with '(' or '{'.
 2020-09-07 21:48:06 +02:00
Maxime Coste
cfbff4e132 Merge remote-tracking branch 'kayhide/purescript-filetype' into master 2020-09-06 11:23:48 +10:00
Maxime Coste
c98d6c3062 Merge remote-tracking branch 'krobelus/initialize-shell-vars' into master 2020-09-06 10:52:07 +10:00
Maxime Coste
cf7955cdfb Merge remote-tracking branch 'lenormf/docstring-newline-format' into master 2020-09-06 10:50:51 +10:00
Maxime Coste
f84c550d30
Apply suggestions from code review 
Co-authored-by: Screwtapello <thristian@gmail.com>
Co-authored-by: Johannes Altmanninger <aclopte@gmail.com>
 2020-09-06 10:56:37 +10:00
Maxime Coste
22676647fe Merge remote-tracking branch 'krobelus/python-no-indent-after-comment' into master 2020-09-06 10:48:49 +10:00
Maxime Coste
97fd0c0510 Merge remote-tracking branch 'lenormf/repl-normalise' into master 2020-09-06 10:48:08 +10:00
Michał Kruszewski
705712f13b Improve latex support. 
Auto insert "\end{[word]}" for "\begin{[word]}".
 2020-09-05 16:14:22 +02:00
Tim Allen
a25cc215e8 Reference content goes in docstrings, explanations go in prose docs. 
Also, make sure docstrings reference the prose docs, so people who stumble over
an interesting-looking command or option can find out more about it.
 2020-09-04 19:20:50 +10:00
Hideaki Kawai
c613e3c7f1 Create purescript filetype 2020-09-04 11:33:08 +09:00
Tim Allen
66cc39cb14 Update plugin docs to not duplicate docstring information. 2020-09-03 17:18:19 +10:00
Tim Allen
9934788155 Add more user-oriented documentation for the documentation system. 2020-09-03 16:49:18 +10:00
Tim Allen
e3298c6320 Address code-review comments 
- some wording changes in included documentation
- find supports multiple starting paths, we don't need to launch it 3 times
- Change the regex that trims the file extension to only trim the last extension

Some additional things I noticed:

- find should use -L to see through symlinks like the autoload processing does.
- find should check the user's autoload directory first, so users can override
  Kakoune's built-in documentation.
 2020-09-03 15:21:54 +10:00
Tim Allen
d628cb50cf rc: Add some documentation for existing plugins.. 2020-09-03 01:55:36 +10:00
Tim Allen
4296305171 doc.kak: Also search through plugins (stdlib and per-user) for docs. 
This makes the somewhat-dubious assumption that every plugin will have uniquely-
named documentation files, instead of automatically putting every plugin's docs
into a namespace. However, plugins already have to deal with flat namespaces for
commands, options, filetypes, etc. so one more shouldn't hurt.

Fixes #2466.
 2020-09-03 01:19:20 +10:00
Frank LENORMAND
0cd706254a rc clang grep: Make docstrings more readable 2020-09-02 11:57:34 +03:00
Johannes Altmanninger
407c72d90a Clear unwanted environment variable 
This adds two things I forgot in
9a7d8df4 (Avoid accidentally using environment variables in sh scopes)

Mea culpa, the problem was that I was skipping matches with "filetype"
because that's usually just a hook parameter as in "WinSetOption filetype=.."

	rg --pcre2 '\b(?!filetype=)\w+=' rc/

So I missed these two cases where a shell variable is actually called "filetype".

The one in git.kak was not a problem because show_git_cmd_output is only
ever called with sane inputs.  However, file.kak does use the filetype
environment variable for many mime types, for example:

	filetype=somefiletype\''; echo -debug injection; nop '\' kak /dev/null

Will run the echo since /dev/null has mime type "inode/chardevice"
 2020-09-02 06:54:19 +02:00
Johannes Altmanninger
e1de4aa118 python.kak: Do not indent after comments ending in : 
Fixes #3693

This will not work for lines like the one below but I think that's okay
because it does work for most comments.

	foo() # foo:
 2020-09-02 06:44:36 +02:00
Frank LENORMAND
87f9be6723 rc repl: Normalise REPL commands 
It's unclear what the `send-text` alias does at first glance,
so prefixing it with "repl-" both fixes that and helps make it
discoverable via the command prompt's fuzzy matcher.

The `repl` alias also seems too generic a name, the "-new" suffix
should hopefully give a hint that it creates a new window.
 2020-09-01 13:34:52 +03:00
Frank LENORMAND
3145e3e939 rc markdown: Highlight trailing spaces properly 
This commit addresses the following issues:

* highlight trailing space characters with the `meta` face, instead of
  `PrimarySelection`
* make the regex more readable by using a capture group in stead of
  `\K`
* specifically match space characters, not other horizontal whitespace
  characters
* match two or more space characters

Reference[1]:

> When you do want to insert a <br /> break tag using Markdown, you
> end a line with two or more spaces, then type return.

[1] https://daringfireball.net/projects/markdown/syntax#p

Note that the original reproducer doesn't seem to work anymore,
probably because of changes made to how lists are highlighted.

Fixes #911
 2020-09-01 13:12:58 +03:00
Ludvig Böklin
0e84cdb016 Mercury-lang filetype support 2020-08-31 16:36:43 +02:00
Maxime Coste
4793a4e8ce Allow multiple arguments in tmux repl 
Fixes #3680
 2020-08-30 10:53:03 +10:00
Johannes Altmanninger
9a7d8df447 Avoid accidentally using environment variables in sh scopes 
On the instances with altfile this was already the case, but this makes it more obvious.

Closes #3673
 2020-08-24 19:01:05 +02:00
Maxime Coste
4b7fd68d48 Merge remote-tracking branch 'krobelus/indent-after-keyword' 2020-08-24 19:24:19 +10:00
Maxime Coste
beeaf19801 Merge remote-tracking branch 'krobelus/highlight-nested-variable-expansions' 2020-08-24 19:23:35 +10:00
Johannes Altmanninger
ab76ec981a Avoid extra indent when line does not end on keyword 
For example there was an indent after a line like "echo todo" with filetype sh
because the "do" in "todo" was recognised as keyword.
 2020-08-23 19:15:52 +02:00
Johannes Altmanninger
473967df04 fish.kak: add missing highlighting for builtins true and string 
I forgot them last time, sorry for the noise
 2020-08-23 19:15:52 +02:00
Johannes Altmanninger
caf9739329 sh.kak: Don't leak highlighting of nested variable expansions 
Fixes #3675
 2020-08-23 19:15:52 +02:00
Maxime Coste
78a7c5fe9b Merge remote-tracking branch 'alexherbo2/kakrc' 2020-08-23 13:59:41 +10:00
Maxime Coste
7f5959d295 Merge branch 'grep' of http://github.com/vbauerster/kakoune 2020-08-23 13:57:40 +10:00
Alex Leferry 2
3f8d3dcf86 kakrc: Add trigger-user-hook keyword 2020-08-22 23:16:46 +02:00
Maxime Coste
0b3b912ffc Merge remote-tracking branch 'SolitudeSF/nim' 2020-08-20 19:00:36 +10:00
Maxime Coste
4e4a65e944 Merge branch 'sh-insert' of http://github.com/SeerLite/kakoune 2020-08-17 20:03:12 +10:00
Maxime Coste
83685501ea Merge remote-tracking branch 'caksoylar/fix-python-ops' 2020-08-17 19:59:43 +10:00
SeerLite
e0c756d943 kakrc.kak: Split auto-insert and auto-indent hooks 2020-08-14 23:43:43 -04:00
SeerLite
1af4a1b1a8 sh.kak: Split auto-insert and auto-indent hooks 2020-08-14 23:42:52 -04:00
Vladimir Bauer
649e252f75 bring *grep* buffer to front in context of toolsclient 2020-08-14 00:52:22 +05:00
Cem Aksoylar
03032d6c3e Add assignment expression := (walrus) operator 2020-08-12 23:12:35 -07:00
Cem Aksoylar
e9b0e9a57d Fix <> and ** operators highlighting 2020-08-12 23:11:43 -07:00
Parasrah
151fe01a5c
fix #3651 
Similar to Jinja, getting `eex` highlighting in *.ex files
will require users to setup a filetype hook similar to the
following:

hook global WinSetOption filetype=elixir %{
    require-module eex
    add-highlighter window/eex ref eex
}

This is done both to fix a circular dependency between the `elixir`
and `eex` modules, and avoid polluting `elixir` files with false
positives from `eex` highlighting given `eex` is framework specific
 2020-08-12 19:14:27 -06:00
SolitudeSF
328ef122ae
Update keywords and suffixes in nim.kak 2020-08-07 12:59:00 +03:00
Maxime Coste
ba7831035f Merge remote-tracking branch 'johnisom/crystal-filetype' 2020-08-03 18:57:45 +10:00
John Isom
72f658f896 Replace my implementation of crystal-insert-on-new-line with already-existing ruby one 
This fixed a weird bug where if you were typing in the top level scope of a
program (no indentation before statements), the `end`s wouldn't be inserted
for you.
 2020-08-02 11:39:59 -06:00
John Isom
f59bdc614f Fix typo in comment 2020-08-02 11:33:56 -06:00
John Isom
fdf38ecc5e Fix auto indentation for if/case and else 2020-08-02 11:28:27 -06:00
John Isom
6cf39a5f4f Fix auto indentation for if/case and else 2020-08-02 11:22:28 -06:00
Maxime Coste
616f6bbe9b Merge remote-tracking branch 'krobelus/fail-on-missing-tools' 2020-08-02 16:50:33 +10:00
Maxime Coste
f60b0a1441 Merge remote-tracking branch 'johnisom/ruby-indentation' 2020-08-02 16:25:07 +10:00
John Isom
8a02bafe0d Beautify indenting in add-highlighter region for percent literals 2020-08-01 13:54:16 -06:00
John Isom
dee96f8e82 Improve syntax highlighting of Ruby percent literals 
The syntax highlighting has been broken down into 3 main categories:
string: string, array of words
variable: symbol, array of symbols
meta: regexp, shell execution
 2020-08-01 13:37:40 -06:00
John Isom
92558bb675 Add rule for % string literals without bracket/style chars; no recurse yet 
Becuase %Q^hello^ is a perfectly valid Ruby string literal. Strange, I know.
 2020-08-01 13:18:47 -06:00
John Isom
e858df3ca2 Add 'else' to auto deindent/align logic in context of 'case' statement 2020-08-01 12:12:48 -06:00
John Isom
57e9719c25 Add 'else' to auto deindent/align logic in context of 'case' statement 2020-08-01 11:57:38 -06:00
John Isom
322d0659fd Add 'when' to list of keywords that signifies end for ruby-insert-on-new-line 2020-08-01 11:54:57 -06:00
John Isom
dbb548af2d Fill in implementation of crystal-insert-on-new-line 2020-08-01 11:46:35 -06:00
John Isom
c36583524c Reorder definition of 3 indent/insert commands 2020-08-01 11:32:16 -06:00
John Isom
0d4dfbc349 Implement copying comment char (#) and whitespace after it 2020-08-01 11:31:28 -06:00
John Isom
8f0843978e Beautify indentation of 'crystal-indent-on-char' 2020-08-01 11:19:36 -06:00
John Isom
a6329b4bfc Fix deindentation of end to make it go to the right level 2020-08-01 11:18:41 -06:00
John Isom
d6e3c1ff19 Fix deindenting nested blocks/statements 2020-08-01 10:52:26 -06:00
John Isom
145f2db741 Add rule to align 'end' with opening statement 2020-08-01 10:35:34 -06:00
John Isom
0fe71ebada Add deindentation rule for 'rescue' statement 2020-08-01 10:33:35 -06:00
John Isom
21c083f47c Add rule to align 'when' to 'case' 2020-08-01 10:32:45 -06:00
John Isom
b7490d853d Add support for deindenting rescue statment when part of def (instead of just begin) 2020-08-01 10:28:54 -06:00
John Isom
76eadef00b Add rule to align else/elsif to opening if 2020-08-01 10:27:51 -06:00
John Isom
e84ebfdfab Replace ') <a-&>' with '1<a-&>' 2020-08-01 10:16:48 -06:00
John Isom
2c382de1e8 Add indenting after starting structure/opening statement 2020-08-01 10:08:47 -06:00
John Isom
ee842da85a Replace manual whitespace trimming to use function created in prev. commit 2020-08-01 09:59:53 -06:00
John Isom
62ac42bb23 Add 'crystal-trim-indent' command 
This removes trailing whitespaces from the end of lines
 2020-08-01 09:58:21 -06:00
John Isom
783fac3d61 Remove single quotes from 'execute-keys -draft ...' keys 2020-08-01 09:56:02 -06:00
John Isom
0063e4c4f5 Collapse 'try %{ execute-keys ... }' blocks to one line 2020-08-01 09:55:15 -06:00
John Isom
73f5f32385 Wrap all 'indent-on-new-line' commands in 'evaluate-commands -no-hook -draft -itersel' 2020-08-01 09:53:51 -06:00
John Isom
b23a85e747 Beautify percent string literals highlighters spacing/indentation 2020-08-01 09:50:27 -06:00
John Isom
0c591baae3 Add 'crystal-indent-on-char' and 'crystal-insert-on-new-line' hooks and functions 2020-08-01 09:49:53 -06:00
John Isom
591cb83da4 Rename 'crystal-new-line-inserted' to 'crystal-indent-on-new-line' 
This gives the function clear responsibility, whereas the naming
before was unclear
 2020-08-01 09:39:08 -06:00
John Isom
3248f7279c Deindent everything in the 'provide-module crystal...' block 2020-08-01 09:36:14 -06:00
John Isom
a78b6e6ccb Change 2-space indentation to 4-space 2020-08-01 09:34:55 -06:00
John Isom
5c124db5d9 Replace cat emojis with section signs 
Many terminal emulators or fonts don't support the cat emoji, and the section
sign (§) is more semantically correct than a cat.
 2020-08-01 09:30:12 -06:00
John Isom
dc378da87f Add section comments to crystal.kak 2020-08-01 09:27:21 -06:00
John Isom
79fa50dc3e Add namespacing to crystal hooks 2020-08-01 09:24:06 -06:00
John Isom
c793712318 Fix ruby-indent-on-char 2020-07-31 19:24:19 -06:00
Maxime Coste
5292990a0d Fix invalid quoting in python.kak 2020-07-31 15:45:34 +10:00
Maxime Coste
8d51a99a3b Merge remote-tracking branch 'pickfire/rust-highlight' 2020-07-31 07:50:14 +10:00
Kylie McClain
25dafd55fe asciidoc: Add a highlighters for links 2020-07-30 16:56:56 -04:00
Kylie McClain
a2c378c7b3 asciidoc: Add a highlighter for admonition paragraphs 2020-07-30 16:56:56 -04:00
Kylie McClain
e845495cc3 asciidoc: Add a highlighter for [%options] 2020-07-30 16:56:56 -04:00
Kylie McClain
b52c2a532d asciidoc: Add support for negated attributes 2020-07-30 16:56:56 -04:00
Kylie McClain
ad2f61f91a asciidoc: Add a highlighter for list titles 2020-07-30 16:56:56 -04:00
Kylie McClain
04721b8425 asciidoc: Add a highlighter for in-word italics as well 2020-07-30 16:56:52 -04:00
Kylie McClain
a8f3ff21dd asciidoc: Add a highlighter for attribute referencing 2020-07-30 16:50:33 -04:00
Kylie McClain
41532cd3e0 asciidoc: Add comments for clarity 2020-07-30 16:50:31 -04:00
Kylie McClain
7274092955 asciidoc: Add a highlighter for in-word bolding 2020-07-30 16:46:11 -04:00
Maxime Coste
76f1b7a5f9 Merge remote-tracking branch 'tmccombs/asciidoc-comments' 2020-07-30 21:22:17 +10:00
Maxime Coste
1efeb75e83 Merge remote-tracking branch 'somasis/asciidoc-bullet-fix' 2020-07-30 21:18:57 +10:00
Maxime Coste
55fbdb3606 Merge remote-tracking branch 'johnisom/deindent-closing-braces' 2020-07-30 21:14:37 +10:00
Maxime Coste
b322a1f29c Merge remote-tracking branch 'krobelus/highlighting' 2020-07-30 21:09:04 +10:00
Maxime Coste
ac24b72f61 Merge remote-tracking branch 'pickfire/patch-1' 2020-07-30 21:07:26 +10:00
Maxime Coste
e4c27df5f5 Merge remote-tracking branch 'krobelus/done-deindent' 2020-07-30 21:07:03 +10:00
Maxime Coste
898945c8db Merge remote-tracking branch 'krobelus/tmux-terminal-use-client-pane' 2020-07-30 21:05:24 +10:00
John Isom
6258646f41 Fix deindentation in zig.kak 2020-07-29 21:46:51 -06:00
John Isom
4a49868f2c Fix deindentation in sh.kak 2020-07-29 21:31:21 -06:00
John Isom
085fcc2088 Fix deindentation in scala.kak 2020-07-29 21:25:55 -06:00
John Isom
d5fe3a2b12 Fix deindentation in sass.kak 2020-07-29 21:22:38 -06:00
John Isom
cc30131e16 Fix my issues in gluon.kak 2020-07-29 21:22:20 -06:00
John Isom
6c02f80935 Add indent-on-closing-brace rule to sass.kak 2020-07-29 21:10:43 -06:00
John Isom
e02a3711fa Fix my issues in gluon.kak 2020-07-29 21:07:43 -06:00
John Isom
d77fe33e9a Fix my issues in python.kak 2020-07-29 20:45:54 -06:00
John Isom
cf7eab62bd Fix already-existing error in ragel.kak 2020-07-29 20:41:21 -06:00
John Isom
70d1aa114b Fix deindentation in protobuf.kak 2020-07-29 20:41:18 -06:00
John Isom
53188e66c7 Fix deindentation in python.kak 2020-07-29 20:41:14 -06:00
John Isom
14514422db Fix deindentation in ragel.kak 2020-07-29 20:41:05 -06:00
John Isom
858b0dd1c9 Update deindentation in nix.kak 2020-07-29 20:12:54 -06:00
John Isom
5284196cb3 Update deindentation in cue.kak 2020-07-29 17:02:54 -06:00
John Isom
e43981422e Update deindentation in java.kak 2020-07-29 17:02:50 -06:00
John Isom
9c957167fa Update deindentation in c-family.kak 2020-07-29 15:14:35 -06:00
John Isom
9560ef3dd5 Update deindentation in gluon.kak 2020-07-29 15:13:36 -06:00
John Isom
1951f19fd8 Update deindentation rule for awk.kak, cabal.kak, go.kak 2020-07-29 15:06:27 -06:00
John Isom
29e94c46e0 Fix already-existing bug in javascript.kak 2020-07-29 15:04:14 -06:00
John Isom
9d4e33c775 Clean up my previous updates 2020-07-29 09:40:58 -06:00
John Isom
bad751197a Update deindenting in css.kak 2020-07-29 09:35:36 -06:00
John Isom
528feb3422 Update deindenting in dart.kak and javascript.kak 2020-07-29 09:34:29 -06:00
John Isom
4a77566ee6 Update deindenting in cabal.kak 2020-07-29 09:32:43 -06:00
John Isom
21bf092230 Update deindenting in dart.kak 2020-07-29 09:31:20 -06:00
John Isom
2b86826d5a Fix already-existing error in javascript.kak 2020-07-29 09:28:46 -06:00
John Isom
27705d402f Update deindenting in javascript.kak 2020-07-29 09:28:32 -06:00
John Isom
f84fd84b26 Update deindenting in json.kak 2020-07-29 09:27:26 -06:00
John Isom
dc4508d05f Update deindenting in d.kak 2020-07-29 09:07:02 -06:00
John Isom
fb838b9f33 Update deindenting in perl.kak 2020-07-29 08:56:19 -06:00
John Isom
1eb34996e1 Merge branch 'deindent-closing-braces' into HEAD 2020-07-29 08:55:48 -06:00
John Isom
90988f5ee9 Merge commit '84a08982' into HEAD 2020-07-29 08:55:19 -06:00
John Isom
623743e794 Update deindenting in perl.kak 2020-07-29 08:54:19 -06:00
John Isom
ba8fca741c Update deindenting in kakrc.kak 2020-07-29 08:52:04 -06:00
John Isom
507f799ce4 Fix already-existing bug in perl.kak 2020-07-28 20:52:06 -06:00
John Isom
84a08982db Update deindenting in perl.kak 2020-07-28 20:51:19 -06:00
John Isom
655c7aad60 Update deindenting in cabal.kak 2020-07-28 20:50:36 -06:00
John Isom
9edbcd4a46 Update deindenting in dart.kak 2020-07-28 20:50:19 -06:00
John Isom
a5a3ce9e1b Fix already-existing error in php.kak 2020-07-28 20:49:42 -06:00
John Isom
b87b1bd32d Update deindenting in php.kak 2020-07-28 20:49:17 -06:00
John Isom
2de803ee17 Update deindenting in rust.kak 2020-07-28 20:48:57 -06:00
John Isom
70e68e3064 Update deindenting in php.kak 2020-07-28 16:07:03 -06:00
John Isom
be69d6e173 Update deindenting in latex.kak 2020-07-28 16:06:02 -06:00
John Isom
3bd783c337 Update deindenting in perl.kak 2020-07-28 16:04:35 -06:00
John Isom
8f0b56be1f Update deindenting in css.kak 2020-07-28 16:03:15 -06:00
John Isom
6cf0856a15 Update deindenting in cabal.kak 2020-07-28 16:02:31 -06:00
John Isom
f3f477aa04 Fix already-existing error in cabal.kak 2020-07-28 16:01:11 -06:00
John Isom
ec48e07b2a Update deindenting in dart.kak 2020-07-28 15:59:23 -06:00
John Isom
60a1b0cfcb Update deindenting in javascript.kak 2020-07-28 15:33:20 -06:00
John Isom
d7e9702228 Fix my closer tokens issues in javascript.kak 2020-07-28 15:18:57 -06:00
John Isom
94ab56d123 Fix indentation rule for php.kak 2020-07-28 14:58:42 -06:00
John Isom
85d5f50376 Fix indentation rule for perl.kak 2020-07-28 12:55:21 -06:00
Johannes Altmanninger
7d52bae5cb rc/x11: failure message when some external tools are missing 
Addresses #3591
 2020-07-28 20:32:56 +02:00
Johannes Altmanninger
6ca51882a1 c-family.kak: fix /**/ being interpreted as javadoc start 2020-07-28 20:32:56 +02:00
Johannes Altmanninger
0fb99f217a tmux.kak: use TMUX_PANE for tmux-terminal-{horizontal,vertical} 
In case a user connects to the same Kakoune session from multiple tmux
windows/sessions, this makes the splits appear next to the calling client,
instead the client where the Kakoune session was started.
 2020-07-28 20:32:56 +02:00
Johannes Altmanninger
e612f26ec1 rc: conservative comment highlighting for shells 
Fixes spurious comment highlighting for these examples:

	echo \# foo
	echo 1#foo
	echo 2\ #foo
 2020-07-28 20:32:56 +02:00
John Isom
80a5fd2c88 Fix already-existing bug in nix.kak 2020-07-27 21:59:08 -06:00
John Isom
05e8eaac68 Fix indentation rule for nix.kak 2020-07-27 21:58:48 -06:00
John Isom
1d68f8dab9 Fix indentation rule for latex.kak 2020-07-27 21:43:07 -06:00
John Isom
b40a53d26c Remove extraneous -itersel flag from deindent closing brace after cursor 2020-07-27 21:42:47 -06:00
John Isom
d4fee6b197 Fix indentation for closing chars in kakrc.kak 2020-07-27 21:37:49 -06:00
John Isom
d818ff8ac0 Fix indentation for closing braces in kakrc.kak 
This fixes %{ }, %< > style, not %| |, %= =, etc
 2020-07-27 21:26:17 -06:00
John Isom
fd3716a12b Fix typo in comment from 9dd292d100 2020-07-27 20:58:25 -06:00
John Isom
01712e7f3c Change indentation rules in json.kak to be much more intuitive for nested objects 
As it was before, when you had this (| = cursor):

``` json
{
  "foo": {|
}
```

and hit <ret>, this would happen:

``` json
{
  "foo": {
  |
}
```

when it should have been this:
``` json
{
  "foo": {
    |
}
```
 2020-07-27 20:55:34 -06:00
John Isom
9dd292d100 Fix indentation rule for json.kak 2020-07-27 20:52:35 -06:00
John Isom
8c9afa8a91 Simplify closing brace indentation 
Edits same line as previous commit. I replaced a complex selection command
with a simple 1-keystroke alternative.
 2020-07-27 20:48:10 -06:00
John Isom
f958a318c1 Fix already-existing bug in json.kak 
When a closing brace or bracket is typed, it should automatically match
indentation with it's opener. Because of an unescaped ']' literal the regexp
didn't work.
 2020-07-27 20:47:59 -06:00
John Isom
2044f250ae Fix indentation rule for javascript.kak 2020-07-27 20:39:44 -06:00
John Isom
cd53d31384 Fix indentation rule for java.kak 2020-07-27 13:50:51 -06:00
John Isom
c0e14b1cfd Fix existing error regarding indent after opening brace 
This is in gluon.kak, right above my addition
 2020-07-27 13:39:52 -06:00
John Isom
931b90a451 Fix indentation rule for gluon.kak 2020-07-27 13:39:02 -06:00
John Isom
8a079dd82f Fix indentation rule for d.kak 2020-07-27 13:15:05 -06:00
John Isom
56837aed57 Fix indentation rule for dart.kak 2020-07-27 13:11:32 -06:00
John Isom
1f911f1f8a Fix indentation rule for cue.kak 2020-07-27 13:09:18 -06:00
John Isom
24afe43cf6 Fix indentation rule for css.kak 2020-07-27 13:06:24 -06:00
John Isom
b57b474f23 Fix indentation rule for cabal.kak 2020-07-27 12:59:15 -06:00
John Isom
0932f3d441 Fix indentation rule for awk.kak 2020-07-27 12:55:25 -06:00
John Isom
9004502049 Update go brace deindenting to handle bad indentation edge case 2020-07-27 12:19:29 -06:00
John Isom
de214d262c Update rust brace deindenting to handle bad indentation edge case 2020-07-27 12:15:11 -06:00
John Isom
a7567d82c9 Update c-family brace deindenting to handle bad indentation edge case 2020-07-27 12:04:07 -06:00
John Isom
565e3bef1d Update comment wording for deindentation 2020-07-26 20:46:47 -06:00
John Isom
902f2831d8 Fix indentation rule for go.kak 2020-07-26 20:28:14 -06:00
John Isom
194cb17aae Fix indentation rule for rust.kak 2020-07-26 20:04:18 -06:00
John Isom
4b35a701c4 Fix indentation rule for c-family.kak 2020-07-26 18:56:53 -06:00
Johannes Altmanninger
35f27030c3 sh.kak: fix don't always deindent around "done" 
Analogous to #3613
 2020-07-25 20:07:18 +02:00
Kylie McClain
600983b7bb asciidoc: Fix bullet face regular expression 
Additionally, change the bolding regex to account for this.

Fixes #3605.
 2020-07-23 03:03:13 -04:00
Ivan Tham
1bbc88953e
fix shell fi always deindenting after newline 
Always align fi to the line before before deindenting it
```
    ...
        test
    fi%( )
```
always deindent fi on `o`
 2020-07-22 22:27:12 +08:00
Maxime Coste
2df6a57201 Merge remote-tracking branch 'alexherbo2/ruby' 2020-07-21 19:56:43 +10:00
Alex Leferry 2
002e0f8790 Ruby: Better matching of divisions 
Do not include prefix data in match.
 2020-07-20 22:03:27 +02:00
aecepoglu
5396c288a0
ocaml quoted-strings 2020-07-20 13:07:45 +03:00
Maxime Coste
d4962d94ce Merge remote-tracking branch 'alexherbo2/crystal-style-change' 2020-07-18 14:00:33 +10:00
Maxime Coste
f8c4d7b69a Merge remote-tracking branch 'alexherbo2/ruby' 2020-07-18 13:54:31 +10:00
Maxime Coste
82a2bcc661 Merge remote-tracking branch 'pickfire/markdown' 2020-07-18 13:52:29 +10:00
Maxime Coste
3aef55be73 Fix highlighting of rgba colors in kakrc 2020-07-18 13:45:27 +10:00
Ivan Tham
34edb1a8e7 Highlight markdown code block with space 2020-07-11 21:06:12 +08:00
Ivan Tham
974684aa68 Improve rust comment closing handling 
/// foo
    ///%( )

    /// foo
    /// %( )

With `c<ret>bar<esc>`,

    /// foo
    bar

    /// foo
    ///
    /// bar

Based on c-family block comment handling, this patch also add rust
block comment indentation.

This affects `o` behavior on empty comment but it allows a way more
efficient way to clear comments.
 2020-07-09 23:02:50 +08:00
Alex Leferry 2
2219f0ef78 Ruby: Add support for %{…} percent string literals 2020-07-09 11:24:22 +02:00
Ivan Tham
21c38f37cd Fix rust character highlight 2020-07-09 00:21:11 +08:00
Ivan Tham
7bd459f774 Fix rust comment end 2020-07-09 00:21:11 +08:00
Ivan Tham
eac5986323 Fix rust doctest non-hidden macro highlight 2020-07-09 00:21:11 +08:00
Ivan Tham
e14cc26f1b Add default keyword for rust 2020-07-09 00:21:11 +08:00
Ivan Tham
7e09e7fcd5 Update rust rc comment 2020-07-09 00:21:11 +08:00
SolitudeSF
91914a8501
Fix syntax errors. 2020-07-06 14:55:54 +03:00
Simon Fowler
b875a1802c Implement smarter detection of windowing environments. 
This patch centralises the loading of windowing environments, in order
to ensure that by default only a single module is loaded, rather than
the current code which can load multiple potentially incompatible
modules; and in order to provide the user with more control over the
loading of windowing modules.

The patch introduces a new str-list option `windowing_modules` which
defines an ordered list of windowing modules to attempt to load. Modules
are loaded in the order specified in the list until a module loads
without error, at which point the process finishes.

When loaded each windowing module tests the environment to determine
whether it should load (e.g. the tmux module tests to see if it's being
run within a tmux session), and if it determines that it should then it
completes its loading without error. If it doesn't detect an appropriate
environment then it returns an error, and the module loading logic tries
the next module.

The user can override the default `windowing_modules` list to specify
their preferred modules (i.e. they can put kitty ahead of tmux if that's
their preference, or they can leave out the x11 modules alltogether). In
addition, if the `windowing_modules` option is an empty list this
bypasses the environment detection logic completely, and allows the
modules to be loaded manually - this allows a user to replace the
windowing module loading logic with their own manual set up.
 2020-07-05 22:48:31 +10:00
Thayne McCombs
881c7b9f15 Add comment highlighting and options for asciidoc. 
Fixes #3068.
 2020-07-04 00:28:51 -06:00
Maxime Coste
1ca1e8fedc Merge branch 'master' of http://github.com/philgee1981/kakoune 2020-07-03 21:07:04 +10:00
Philman
63c4336a3c
finetuned the :send-text command 
See discussions on [github](https://github.com/philgee1981/kakoune/pull/1) and on [the kakoune message board](https://discuss.kakoune.com/t/trying-to-run-kakoune-repl-with-st-and-dwm/1122/3)
 2020-07-03 06:46:41 +02:00
Maxime Coste
099b83d922 Merge remote-tracking branch 'alexherbo2/eruby' 2020-06-25 21:05:15 +10:00
Maxime Coste
14ba5e38ce Merge branch 'python_fix_highlight' of https://github.com/m-kru/kakoune 2020-06-25 21:02:52 +10:00
Maxime Coste
f5127f8b22 Merge remote-tracking branch 'lenormf/key-percent' 2020-06-25 20:58:26 +10:00
Maxime Coste
42af5e1f9e Merge remote-tracking branch 'lenormf/fix-3432' 2020-06-25 20:57:35 +10:00
Maxime Coste
edd0d2d0ef Merge remote-tracking branch 'eraserhd/more-r7rs-scheme-fixes' 2020-06-25 20:53:12 +10:00
Maxime Coste
b31f3c266f Merge remote-tracking branch 'ii8/master' 2020-06-25 20:52:52 +10:00
Johannes Altmanninger
7e50bdbf2f fish.kak: do not treat escaped quotes as region start 
Just like in sh.kak, for example:

	echo \" \\\" this should not be highlighted
 2020-06-25 00:28:07 +02:00
Murray Calavera
22a94b9d35 Add highlighters for Standard ML 2020-06-23 19:22:35 +01:00
Jason Felice
c08e676aaf scheme.kak: fixes for r7rs word characters 
Was missing _ and @ in various places.
 2020-06-17 15:51:47 -04:00
Maxime Coste
8b3696982f Merge remote-tracking branch 'caksoylar/lint-tools' 2020-06-16 19:10:39 +10:00
Maxime Coste
5c02bb2030 Merge remote-tracking branch 'eraserhd/detect-mime-script-types' 2020-06-16 19:10:01 +10:00
Jason Felice
bdd7ea6a03 Detect text/x-script.* and application/x-* types 2020-06-12 11:29:55 -04:00
Cem Aksoylar
28be53fb39 Make lint.kak utilize toolsclient 2020-06-10 22:39:11 -07:00
Jason Felice
d75792bddd Improve scheme mode 
* Add r7rs functions, keywords, etc.
* Add highlighting for decimal, hex, octal, binary constants
* Add missing word characters
* Resolve several issues with word boundaries
 2020-06-08 09:17:58 -04:00
Alex Leferry 2
ceb859271f Add support for eRuby 
http://www2a.biglobe.ne.jp/~seki/ruby/erb.html
 2020-06-03 15:12:51 +02:00
Frank LENORMAND
61366fd1ef rc man: Handle early window resize 
If the window gets resized before the `man` command is called, the
hook will error out and display an error.

Fix #3432
 2020-06-03 15:47:46 +03:00
Frank LENORMAND
24c5169400 src: Introduce a <percent> named key 
Similarly to the <semicolon> key, make it easier to write
`:execute-keys` commands by replacing <percent> with `%`.

Highlighters can keep escaping the sign when regular expressions are
not quoted, but built-in scripts that use `%` as an editing primitive
have been modified to use the named key, for clarity.
 2020-06-03 15:42:38 +03:00
Maxime Coste
d32d185d48 Merge remote-tracking branch 'pickfire/rust-doctests' 2020-06-02 18:44:53 +10:00
Maxime Coste
d43b6799cf Merge remote-tracking branch 'pickfire/rust-dedent' 2020-06-02 18:40:09 +10:00
Ivan Tham
12cafe3ed4 Rust dedent { after where clause 2020-06-02 00:26:47 +08:00
Ivan Tham
b1beea8638 Rust indent after standalone where 2020-05-31 18:13:04 +08:00
Ivan Tham
de4b7f3864 Rust indent block comment 2020-05-31 18:07:17 +08:00
Ivan Tham
97c4cb243b Highlight rust default keyword (specialization) 2020-05-31 17:49:43 +08:00
Ivan Tham
4ccb5fd315 Highlight doc tests in rust 
Feels a big laggy when system overloaded
 2020-05-31 11:47:47 +08:00
Alex Leferry 2
23a428c9af Crystal: Slight style change 2020-05-30 23:10:22 +02:00
Michał Kruszewski
7661e67551 Fix python attributes highlight. 2020-05-30 16:47:32 +02:00
Ivan Tham
479790633b Fix rust reference url 2020-05-30 19:23:55 +08:00
Ivan Tham
dd3257e3f2 Rust take indentation before comment to next line 2020-05-30 10:54:55 +08:00
Ivan Tham
7c791f130c Handle dedent in rust syntax 
Naively handle dedent after , and ; which works most of the cases but
does not work with multi level dedent.
 2020-05-30 10:54:55 +08:00
Maxime Coste
321facb594 Merge remote-tracking branch 'Anfid/lua-fixes' 2020-05-30 09:29:48 +10:00
Maxime Coste
1a185f5d6f Merge remote-tracking branch 'Phlogistique/eex' 2020-05-30 09:25:19 +10:00
Maxime Coste
3589791670 Merge remote-tracking branch 'Guest0x0/master' 2020-05-30 09:24:25 +10:00
Maxime Coste
d1f4b44655 Merge remote-tracking branch 'lenormf/fix-ini' 2020-05-30 09:22:37 +10:00
Maxime Coste
0b56c777c0 Merge remote-tracking branch 'lenormf/fix-spell-next' 2020-05-30 09:22:06 +10:00
Maxime Coste
f939055e22 Merge remote-tracking branch 'lenormf/remove-bold-italic-faces' 2020-05-30 09:21:08 +10:00
Maxime Coste
65921d0515 Merge branch 'fix-perl-regex' of https://github.com/buffet/kakoune 2020-05-30 09:20:00 +10:00
Maxime Coste
2a28779998 Merge branch 'latex' of http://github.com/mreppen/kakoune 2020-05-30 09:14:39 +10:00
Maxime Coste
3f787acb4f Merge remote-tracking branch 'greenfork/add-underscores-to-zig-integers-highlighting' 2020-05-30 09:13:17 +10:00
Maxime Coste
0315b2e3f5 Merge remote-tracking branch 'greenfork/add-default-comments-for-zig' 2020-05-30 09:12:51 +10:00
Maxime Coste
a28deb0aaf Merge branch 'highlight-markdown' of https://github.com/pickfire/kakoune 2020-05-30 09:11:45 +10:00
Maxime Coste
c716f5d4e4 Merge remote-tracking branch 'krobelus/02-sh-space-before-heredoc-keyword' 2020-05-30 09:07:20 +10:00
Maxime Coste
c8fde1bf33 Merge remote-tracking branch 'krobelus/01-fish-single-quote-highlighting' 2020-05-30 09:07:01 +10:00
Maxime Coste
d90f8d4324 Merge remote-tracking branch 'lenormf/remove-lint-enable' 2020-05-30 09:05:53 +10:00
Max Reppen
6f5bc42b87 LaTeX highlighter improvements 
Added \(\) highlighter
 2020-05-29 17:46:06 -04:00