adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime(vim): Update base-syntax, match :loadkeymap after colon and bar

Browse Source 
Match :loadkeymap after Ex colons and bars.

Don't generate :loadkeymap as it is matched with a custom syntax group.

closes: #15554

Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Doug Kearns
2024-08-23 18:37:55 +02:00
committed by Christian Brabandt
parent 5d1c551057
commit 7866d54ecc
22 changed files with 82 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump
View File

@ -10,7 +10,7 @@
|:|l+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
|:|l+0#af5f00255&|N|f|i|l|e| +0#0000000&@67
|:|l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
|:|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@63
|#+0#0000e05&| |:|l|o|a|d|k|e|y|m|a|p| |#| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@33
|:|l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@65
|:|l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@64
|:|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@66

2
runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump
View File

@ -3,7 +3,7 @@
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|n|f|i|l|e| +0#0000000&@60
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|N|f|i|l|e| +0#0000000&@60
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@58
>F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@56
>#+0#0000e05&| |F|o@1|(|)| ||| |l|o|a|d|k|e|y|m|a|p| |#| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@26
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@58
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@57
|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@59

2
runtime/syntax/testdir/dumps/vim9_keymap_00.dump → runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump
View File

@ -1,6 +1,6 @@
>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
@75
|#+0#0000e05&| |V|i|m| |K|e|y|m|a|p| |f|i|l|e| |f|o|r| |s|y|n|t|a|x| |t|e|s|t|i|n|g| +0#0000000&@38
|#+0#0000e05&| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| +0#0000000&@49
@75
|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
@75

0
runtime/syntax/testdir/dumps/vim9_keymap_01.dump → runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
View File

2
runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
View File

@ -6,7 +6,7 @@
>:|l+0#af5f00255&|n|e|w|e|r| +0#0000000&@67
|:|l+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
|:|l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
|:|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@63
|"+0#0000e05&| |:|l|o|a|d|k|e|y|m|a|p| |"| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@33
|:|l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@65
|:|l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@64
|:|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@66

2
runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
View File

@ -1,6 +1,6 @@
|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|n|f|i|l|e| +0#0000000&@55
|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@51
|"+0#0000e05&| |c|a|l@1| |F|o@1|(|)| ||| |l|o|a|d|k|e|y|m|a|p| |"| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@21
|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@53
|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@52
>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@54

2
runtime/syntax/testdir/dumps/vim_keymap_00.dump → runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump
View File

@ -1,4 +1,4 @@
>"+0#0000e05#ffffff0| |V|i|m| |K|e|y|m|a|p| |f|i|l|e| |f|o|r| |s|y|n|t|a|x| |t|e|s|t|i|n|g| +0#0000000&@38
>"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| +0#0000000&@49
@75
|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
@75

0
runtime/syntax/testdir/dumps/vim_keymap_01.dump → runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
View File

20
runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump Normal file
View File

@ -0,0 +1,20 @@
>"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| |(|a|f|t|e|r| |"+0#e000002&|||"|)+0#0000e05&| +0#0000000&@37
@75
|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
@75
|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"| +0#0000000&@41
@75
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&||| |l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@51
@75
|a| |A| @3|B+0#0000e05&|a|s|i|c| |m|a|p@1|i|n|g| +0#0000000&@54
@75
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
| +0#0000000&@56|1|,|1| @10|A|l@1|

20
runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump Normal file
View File

@ -0,0 +1,20 @@
>"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| |(|a|f|t|e|r| |"+0#e000002&|:|"|)+0#0000e05&| +0#0000000&@37
@75
|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
@75
|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"| +0#0000000&@41
@75
|:|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@63
@75
|a| |A| @3|B+0#0000e05&|a|s|i|c| |m|a|p@1|i|n|g| +0#0000000&@54
@75
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
| +0#0000000&@56|1|,|1| @10|A|l@1|

20
runtime/syntax/testdir/dumps/vim_keymap_02.dump
View File

@ -1,20 +0,0 @@
| +0&#ffffff0@74
@75
@75
@75
|l+0#af5f00255&|o|a|d|k|e|y|m|a|p| +0#0000000&@64
@75
@75
@75
@75
@75
@75
@45> @29
|"+0#0000e05&| |L|i|n|e| |c|o|m@1|e|n|t| @60
@60| +0#0000000&@14
@75
@75
@2|"+0#0000e05&| |A|n|o|t|h|e|r| |l|i|n|e| |c|o|m@1|e|n|t| @15| +0#0000000&@34
@75
@75
@57|1@1|,|2|7|1| @7|4|0|%|

20
runtime/syntax/testdir/dumps/vim_keymap_03.dump
View File

@ -1,20 +0,0 @@
| +0&#ffffff0@74
@75
|a| |A| @3|B+0#0000e05&|a|s|i|c| |m|a|p@1|i|n|g| @38| +0#0000000&@15
|'|a| |á| @2|M+0#0000e05&|o|r|e| |t|h|a|n| |o|n|e| |c|h|a|r| |i|n| |f|i|r|s|t| |c|o|l|u|m|n| @10| +0#0000000&@22
@75
>"+0#0000e05&| |S|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| @56
@60| +0#0000000&@14
|<+0#e000e06&|c|h|a|r|-|6|2|>| +0#0000000&@5|B| @14|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |-| |d|e|c|i|m|a|l| @2
@75
@75
@46| +0#0000000&@28
|c| @13|<+0#e000e06&|c|h|a|r|-|0|1|0|3|>| +0#0000000&@4|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |R|H|S| |-| |o|c|t|a|l| @4
@60| +0#0000000&@14
|<+0#e000e06&|c|h|a|r|-|0|x|0@1|6|4|>| +0#0000000&@1|<+0#e000e06&|c|h|a|r|-|0|x|0@1|4@1|>| +0#0000000&@2|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |a|n|d| |R|H|S| |-| |h|e
|x|a|d|e|c|i|m|a|l| @50| +0#0000000&@14
@75
|"+0#0000e05&| |V|i|m|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| |c|h|a|r|a|c|t|e|r|s| @30| +0#0000000&@12
|#| |<+0#e000e06&|c|h|a|r|-|0|x|0@1|a|3|>| +0#0000000&@15|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e
|n|t| +0#0000000&@72
@57|1|9|,|1| @9|8|7|%|

20
runtime/syntax/testdir/dumps/vim_keymap_04.dump
View File

@ -1,20 +0,0 @@
|#+0&#ffffff0| |<+0#e000e06&|c|h|a|r|-|0|x|0@1|a|3|>| +0#0000000&@15|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e
|n|t| +0#0000000&@72
|\|"| |“| @26|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m
@1|e|n|t| | +0#0000000&@69
>:| |"| @27|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m
@1|e|n|t| +0#0000000&@70
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
| +0#0000000&@56|2|7|,|1| @9|B|o|t|

4
runtime/syntax/testdir/input/vim9_ex_commands.vim
View File

@ -293,7 +293,7 @@ vim9script
:lnfile
:lNfile
:lnoremap
:loadkeymap
# :loadkeymap # disabled - runs until EOF
:loadview
:lockmarks
:lockvar
@ -880,7 +880,7 @@ Foo() | lNext
Foo() | lnfile
Foo() | lNfile
Foo() | lnoremap
Foo() | loadkeymap
# Foo() | loadkeymap # disabled - runs until EOF
Foo() | loadview
Foo() | lockmarks
Foo() | lockvar

2
runtime/syntax/testdir/input/vim9_keymap.vim → runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
View File

@ -1,6 +1,6 @@
vim9script
# Vim Keymap file for syntax testing
# Vim :loadkeymap command
scriptencoding utf-8

4
runtime/syntax/testdir/input/vim_ex_commands.vim
View File

@ -289,7 +289,7 @@
:lnewer
:lnfile
:lnoremap
:loadkeymap
" :loadkeymap " disabled - runs until EOF
:loadview
:lockmarks
:lockvar
@ -877,7 +877,7 @@ call Foo() | lnext
call Foo() | lnewer
call Foo() | lnfile
call Foo() | lnoremap
call Foo() | loadkeymap
" call Foo() | loadkeymap " disabled - runs until EOF
call Foo() | loadview
call Foo() | lockmarks
call Foo() | lockvar

2
runtime/syntax/testdir/input/vim_keymap.vim → runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
View File

@ -1,4 +1,4 @@
" Vim Keymap file for syntax testing
" Vim :loadkeymap command
scriptencoding utf-8

10
runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim Normal file
View File

@ -0,0 +1,10 @@
" Vim :loadkeymap command (after "|")
scriptencoding utf-8
let b:keymap_name = "syntax-test"
echo "..." | loadkeymap
a A Basic mapping

10
runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim Normal file
View File

@ -0,0 +1,10 @@
" Vim :loadkeymap command (after ":")
scriptencoding utf-8
let b:keymap_name = "syntax-test"
:loadkeymap
a A Basic mapping