annotate runtime/syntax/testdir/input/vim_ex_comment-vim9.vim @ 34870:3f9703c1bbea

runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104) Commit: https://github.com/vim/vim/commit/04e5363b823827f144409df011376d00ea6df750 Author: dkearns <dougkearns@gmail.com> Date: Thu Apr 11 06:18:37 2024 +1000 runtime(vim): Improve Vim9 and legacy-script comment highlighting (https://github.com/vim/vim/issues/13104) This is a first-pass attempt to limit matching of Vim9 and legacy-script comments to the appropriate syntactic contexts. Vim9-script comments are highlighted at top level in a Vim9-script file, in all :def functions, and in all :autocmd and :commmand command blocks. Legacy-script comments are highlighted at top level in a legacy script file, in all :func functions and in the Vim9-script preamble before the :vim9script marker command. Fixes #13047, #11307 and #9587. Signed-off-by: Doug Kearns <dougkearns@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Wed, 10 Apr 2024 22:30:04 +0200
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
34870
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
1 vim9script
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
2
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
3 # Vim comments
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
4
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
5 # Vim9-script comment
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
6
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
7 # string only recognised with leading char
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
8 "useless string"
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
9
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
10 function! Foo()
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
11 " Legacy-script comment
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
12 # 42 " comment
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
13 endfunction
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
14
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
15 def! Bar()
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
16 # Vim9-script comment
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
17 "useless string" # comment
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
18 enddef
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
19
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
20 command -count FooCommand {
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
21 # Vim9-script comment
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
22 "useless string" # comment
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
23 }
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
24
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
25 autocmd BufNewFile * {
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
26 # Vim9-script comment
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
27 "useless string" # comment
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
28 }
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
29
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
30
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
31 # Issue: #13047
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
32
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
33 if !exists(":DiffOrig")
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
34 command DiffOrig vert new | set bt=nofile | r ++edit %% | 0d_ | diffthis
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
35 \ | wincmd p | diffthis
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
36 endif
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
37
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
38
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
39 # Issue: #11307 and #11560
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
40
3f9703c1bbea runtime(vim): Improve Vim9 and legacy-script comment highlighting (#13104)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
41 # This is what we call " blah