Maxime Coste
7a130c89ce
Merge remote-tracking branch 'jdugan6240/odin-support'
2023-11-05 13:48:57 +11:00
Maxime Coste
1da8952e1f
Merge remote-tracking branch 'lobre/git-edit'
2023-11-05 11:12:43 +11:00
Maxime Coste
c0788f370b
Merge remote-tracking branch 'krobelus/patch-selected-lines'
2023-11-05 11:09:41 +11:00
Loric Brevet
83b7bbdc55
rc/tools/git: edit a git indexed file with git edit
2023-11-04 13:43:10 +01:00
Johannes Altmanninger
286dab11d4
rc tools git: "git apply" to apply selections in diffs
...
This adds a somewhat discoverable frontend for common uses of the
patch command.
Here are some frequently used commands
# apply selected changes
git apply
# revert selected changes
git apply -R
# stage selected changes
git apply --cached
# unstage selected changes
git apply --cached -R
# apply selected changes and stage them
git apply --index
For everyday use that's a lot of typing so I recommend adding mappings.
2023-11-04 12:14:48 +01:00
Johannes Altmanninger
8c0424b521
rc tools patch: "patch" command to apply selections in diffs to file
...
One of the features I miss most from Magit/Fugitive/Tig is to
apply/revert/stage/unstage individual hunks or even exactly the
selected line(s). This provides a much more convenient way of
splitting changes than "git add/restore -p".
Implement a "patch" command that applies the selected lines within
a diff by piping them to the "patch" program.
It can also feed other programs like "git apply" (see the next commit).
Original discussion: https://discuss.kakoune.com/t/atomic-commits-in-kakoune/1446
Interestingly, :patch is defined outside the "patch" module. This is
to make it readily available for interactive use.
Putting it into the module does not save any work.
I tentatively added a patch module anyway so we can explicitly declare
this dependency.. although there is the argument that this is not
really needed?
2023-11-04 12:14:48 +01:00
Dimitri Sabadie
27f19fdd91
Rename diff_* into git_diff_*.
2023-11-03 22:04:22 +01:00
Dimitri Sabadie
8e10822a87
Support setting diff characters in git diffs.
...
This commit adds `diff_add_char`, `diff_mod_char`, `diff_del_char` and `diff_top_char` as `str` options, with typical
defaults.
This commit also replaces the hard coded +, _, ≃, etc. hardcoded characters in `git update-diff` to use the options from
above.
2023-11-03 22:04:22 +01:00
Maxime Coste
154a393c7b
Merge remote-tracking branch 'arrufat/zig-syntax'
2023-11-02 18:29:35 +11:00
Maxime Coste
41e57f62dc
Merge branch 'juliacolors' of http://github.com/chriselrod/kakoune
2023-11-02 18:28:53 +11:00
Maxime Coste
e882c23501
Merge remote-tracking branch 'greenfork/improve-janet-syntax'
2023-11-02 18:21:59 +11:00
Maxime Coste
81d94ac06c
Merge remote-tracking branch 'ii8/master'
2023-11-02 18:21:15 +11:00
Adrià Arrufat
0015a29c19
rc/filetype/zig: remove align builtin and add f80 type
...
In commit ca36d0d228
the align function was added as a builtin accidentally.
Also, f80 type was added in Zig 0.10.0: https://ziglang.org/download/0.10.0/release-notes.html#f80
2023-11-02 12:13:41 +09:00
Bob Qi
8424fbe0f0
rc/make.kak reuse make_error_pattern
2023-11-02 09:11:18 +08:00
chriselrod
7bc1504725
@macro!
2023-11-01 17:23:03 -04:00
chriselrod
bf4f780cfa
Many more Julia operators
2023-10-31 23:13:33 -04:00
chriselrod
e48d81d20b
Add more highlighters for Julia
2023-10-31 22:49:19 -04:00
Dmitry Matveyev
4332b0dc71
janet: syntax improvements and trailing whitespace cleaning
2023-10-31 11:15:38 +04:00
murray
b20747d44e
Gren highlighting
...
Gren is an elm fork and it's syntax is currently still
similar enough to use the same highlighter.
2023-10-29 20:51:42 +00:00
Bob Qi
760f63b827
rc/make.kak set option type to be regex
2023-10-29 09:05:33 +08:00
Bob Qi
cb540def46
rc/make.kak avoid another using pattern directly
2023-10-27 10:16:57 +08:00
Bob Qi
8e5ca3f214
rc/make.kak introduce a new option to be back compatible
2023-10-27 09:57:10 +08:00
Bob Qi
2d849cc147
rc/make.kak set search register to avoid injection
2023-10-27 08:25:38 +08:00
Bob Qi
d0571ce238
rc/make.kak support override the whole error line pattern
2023-10-26 10:13:07 +08:00
Maxime Coste
b020922e6f
Fix some corner cases in c-family indentation
2023-10-25 12:51:16 +11:00
Maxime Coste
d50048d0b4
Highlight a few extra mail headers
2023-10-24 10:47:20 +11:00
Maxime Coste
5c793a6a1e
Merge remote-tracking branch 'Screwtapello/hint-git-next-hunk'
2023-10-04 21:04:27 +11:00
Tim Allen
9286a7ee49
Make "git next-hunk" hint about how it works.
2023-10-04 10:53:20 +11:00
Tim Allen
87787defd8
The command is called "git prev-hunk", not "git previous-hunk".
2023-10-04 10:52:15 +11:00
Caleb Heuer
5ec40c63b2
Add highlighting of Lua variables, labels, and self keyword
2023-09-30 11:57:30 -06:00
James Dugan
24ab9d4343
Added odinlang support
2023-09-24 17:03:07 -06:00
Maxime Coste
12f42a2faf
Merge remote-tracking branch 'stacyharper/git-grep-complete'
2023-09-23 21:26:40 +10:00
Bob Qi
235552c5fa
rc/tools/git add --column to git grep
2023-09-18 16:18:32 +08:00
Willow Barraco
cfd7d8e361
rc/tools/git: add basic completion for git-grep
2023-09-12 11:32:26 +02:00
Willow Barraco
01fd6552af
tools/git: add git grep using existing grep tool
2023-09-10 11:31:07 +02:00
Maxime Coste
f21145c249
Merge remote-tracking branch 'QiBaobin/filetype-grovvy'
2023-09-08 05:28:56 +10:00
Maxime Coste
76306f7c05
Merge remote-tracking branch 'raiguard/rc/go-highlighting'
2023-09-08 05:28:08 +10:00
Bob Qi
8f6ef9512f
add groovy filetype
2023-09-07 09:52:00 +08:00
Caleb Heuer
142925fc90
This is numerics, not identifiers
2023-09-06 12:24:06 -06:00
Caleb Heuer
c338efe078
Support generics in function highlighting
2023-09-06 12:03:49 -06:00
Caleb Heuer
6148a16a0e
Add spread operator
2023-09-06 12:03:49 -06:00
Caleb Heuer
88bb854f36
Improve Go highlighting
2023-09-06 12:03:49 -06:00
Bob Qi
c6270512fd
fix a sed error on mac
...
sed: 1: "/^&/ { s/^[^:]*: //; s/ ...": extra characters at the end of p command
2023-09-05 14:48:26 +08:00
Michał Kruszewski
521549fb69
troff: Highlight .PSPIC and .PDFPIC macros
2023-07-30 09:47:10 +02:00
Maxime Coste
dad128e4a6
Merge remote-tracking branch 'QiBaobin/rc/windowing/wezterm'
2023-07-29 15:34:15 +10:00
Maxime Coste
90acec991f
Merge remote-tracking branch 'omasanori/ocaml-lex-and-yacc'
2023-07-29 15:33:48 +10:00
Maxime Coste
991b233468
Merge remote-tracking branch 'arrufat/zig-builtin-functions'
2023-07-29 15:33:15 +10:00
Bob Qi
117f12dbd6
pass cwd for wezterm terminal
2023-07-27 13:28:37 +08:00
Masanori Ogino
8fb0a99f05
Detect .mll and .mly files as OCaml sources
2023-07-26 17:15:06 +09:00
Adrià Arrufat
fdb33e7302
zig: add c_char type
2023-07-26 12:37:35 +09:00