Commit Graph

1448 Commits

Author SHA1 Message Date
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
Delapouite
425aa56eaf Use remove-hooks regex in rc 2018-09-19 19:59:57 +02:00
Andrey Orst
b3f817c1ff
Fix highlighting of unsigned long long in C filetype
Values like `0xffffffffffffffffull` were highlighted only till first `u` leaving `ll` without highlighting. This change addresses this issue. It also adds uppercase `ULL` highlighting in values.
2018-09-19 16:50:26 +03:00
Maxime Coste
7956e893be Merge remote-tracking branch 'laelath/git-hide-diff' 2018-09-18 22:30:50 +10:00