]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
runtime(vim): Update base syntax, match Vim9 lambda arg to :defer
authorDoug Kearns <dougkearns@gmail.com>
Tue, 28 Oct 2025 20:36:04 +0000 (20:36 +0000)
committerChristian Brabandt <cb@256bit.org>
Tue, 28 Oct 2025 20:36:04 +0000 (20:36 +0000)
Support added in commit 21ef3c6e5972bbe8ab61195f98ccb85048b78985.

See: #18643
closes: #18645

Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
runtime/syntax/generator/vim.vim.base
runtime/syntax/testdir/dumps/vim_ex_defer_00.dump
runtime/syntax/testdir/input/vim_ex_defer.vim
runtime/syntax/vim.vim

index 650f4161370b2b280301053c1a0da1fbe85a09c1..40139de24bef3ae54ed3c24a9b8a8d3ab58b1606 100644 (file)
@@ -2,7 +2,7 @@
 " Language:       Vim script
 " Maintainer:     Hirohito Higashi <h.east.727 ATMARK gmail.com>
 "         Doug Kearns <dougkearns@gmail.com>
-" Last Change:    2025 Oct 22
+" Last Change:    2025 Oct 27
 " Former Maintainer: Charles E. Campbell
 
 " DO NOT CHANGE DIRECTLY.
@@ -318,7 +318,7 @@ syn match   vimDebuggreedy  "\<0\=debugg\%[reedy]\>" contains=vimCount
 
 " Defer {{{2
 " =====
-syn match      vimDefer        "\<defer\=\>"   skipwhite nextgroup=@vimFunc
+syn match      vimDefer        "\<defer\=\>"   skipwhite nextgroup=@vimFunc,vim9LambdaParams
 
 " Exception Handling {{{2
 syn keyword    vimThrow        th[row] skipwhite nextgroup=@vimExprList
index c6856763f4ac86cfeff6c12595b2f84c92347478..d5a5f5f26a2f62e23661d0fc853cbac4cd992e3c 100644 (file)
 |d+0#af5f00255&|e|f| +0#0000000&|B|a|r|(+0#e000e06&|)| +0#0000000&@65
 @2|d+0#af5f00255&|e|f|e|r| +0#0000000&|d+0#00e0e07&|e|l|e|t|e|(+0#e000e06&|"+0#e000002&|t|m|p|f|i|l|e|"|)+0#e000e06&| +0#0000000&@49
 @2|d+0#af5f00255&|e|f|e|r| +0#0000000&|D+0#0000001#ffff4012|e|l|e|t|e|(+0#e000e06#ffffff0|"+0#e000002&|t|m|p|f|i|l|e|"|)+0#e000e06&| +0#0000000&@49
+@2|d+0#af5f00255&|e|f|e|r| +0#0000000&|(+0#e000e06&|)| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|{+0#e000e06&| +0#0000000&@59
+@4|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@60
+@2|}+0#e000e06&|(|)| +0#0000000&@69
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 |~+0#4040ff13&| @73
 |~| @73
-|~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 
index 146237d7dc6b530d919ead3b31aa1adf5ee01c7d..dd74f0c6eff975200699fbb376a4018869e10c82 100644 (file)
@@ -10,5 +10,8 @@ endfunction
 def Bar()
   defer delete("tmpfile")
   defer Delete("tmpfile")
+  defer () => {
+    echo "..."
+  }()
 enddef
 
index 2fcfc8dd7989d6728f0d0ad65f6e6ddc9c441ca1..19d2a8d50d33c059858786f20a8275278890f68e 100644 (file)
@@ -2,7 +2,7 @@
 " Language:       Vim script
 " Maintainer:     Hirohito Higashi <h.east.727 ATMARK gmail.com>
 "         Doug Kearns <dougkearns@gmail.com>
-" Last Change:    2025 Oct 26
+" Last Change:    2025 Oct 27
 " Former Maintainer: Charles E. Campbell
 
 " DO NOT CHANGE DIRECTLY.
@@ -372,7 +372,7 @@ syn match   vimDebuggreedy  "\<0\=debugg\%[reedy]\>" contains=vimCount
 
 " Defer {{{2
 " =====
-syn match      vimDefer        "\<defer\=\>"   skipwhite nextgroup=@vimFunc
+syn match      vimDefer        "\<defer\=\>"   skipwhite nextgroup=@vimFunc,vim9LambdaParams
 
 " Exception Handling {{{2
 syn keyword    vimThrow        th[row] skipwhite nextgroup=@vimExprList