Mercurial > vim

annotate runtime/syntax/testdir/input/vim_ex_def_fold.vim @ 34935:e8ddbfaf0c85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
runtime(vim): Update base-syntax, fix nested function folding (#14397) Commit: https://github.com/vim/vim/commit/4ba70cab37d2a625d8c59bb136070ef9d1976934 Author: dkearns <dougkearns@gmail.com> Date: Mon Apr 15 04:32:56 2024 +1000 runtime(vim): Update base-syntax, fix nested function folding (https://github.com/vim/vim/issues/14397) Only match function folding start and end patterns at the start of a line, excluding heredocs and :append/:change/:insert commands. Fixes #14393 Signed-off-by: Christian Brabandt <cb@256bit.org> Signed-off-by: Doug Kearns <dougkearns@gmail.com>
author Christian Brabandt <cb@256bit.org>
date Sun, 14 Apr 2024 20:45:05 +0200
parents b8b18dafd432
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
34611
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
1 " Vim :def command
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
2 " VIM_TEST_SETUP let g:vimsyn_folding = "f" | set fdm=syntax
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
3
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
4
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
5 " list
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
6
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
7 def
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
8 def Foo
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
9 def /Foo.*
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
10
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
11 def | echo "Foo"
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
12 def " comment
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
13 def Foo | echo "Foo"
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
14 def Foo " comment
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
15
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
16
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
17 " definition
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
18
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
19 " empty definition
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
20 def Foo()
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
21 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
22
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
23 def Foo(): number
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
24 return 42
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
25 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
26
34828
b8b18dafd432 runtime(vim): Update base-syntax, no curly-brace names in Vim9 script (#14466)
Christian Brabandt <cb@256bit.org>
parents: 34611
diff changeset
27 " trailing whitespace
34611
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
28 def Foo(): number
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
29 return 42
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
30 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
31
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
32 def Foo() # comment
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
33 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
34
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
35 def Foo(): number # comment
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
36 return 42
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
37 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
38
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
39 def! Foo(): number
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
40 return 42
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
41 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
42
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
43 def g:Foo(): number
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
44 return 42
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
45 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
46
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
47 def s:Foo(): number
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
48 return 42
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
49 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
50
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
51 def <SID>Foo(): number
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
52 return 42
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
53 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
54
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
55 def foo#bar#Foo(): number
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
56 return 42
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
57 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
58
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
59 " same name as an Ex command
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
60 def s:ls()
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
61 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
62
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
63
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
64 " return types
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
65
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
66 def Foo(): void
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
67 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
68
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
69 def Foo(): void # comment
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
70 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
71
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
72 def Foo(): list<dict<number>>
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
73 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
74
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
75 def Foo(): func(dict<list<number>>, func, bool, func(number, list<number>)): bool
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
76 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
77
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
78
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
79 " :enddef trailing
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
80
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
81 def Foo()
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
82 # trailing whitespace
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
83 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
84
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
85 def Foo()
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
86 enddef | echo "Foo"
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
87
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
88 def Foo()
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
89 enddef " comment
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
90
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
91
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
92 " parameters
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
93
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
94 def Foo(x: bool, y = 42, z: string = "zed")
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
95 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
96
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
97 def Foo(
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
98 x: bool,
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
99 y = 42,
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
100 z: string = "zed")
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
101 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
102
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
103
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
104 " comments
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
105
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
106 def Foo()
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
107 # Vim9-script comment
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
108 "useless string"
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
109 enddef
1790ce961c7d runtime(vim): Update base-syntax, improve function definition highlighting (#14203)
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
110
34935
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
111
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
112 " fold-region ending
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
113
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
114 def Foo()
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
115 # enddef
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
116 enddef
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
117
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
118 def Foo()
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
119 echo "enddef"
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
120 enddef
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
121
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
122 def Foo()
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
123 let x =<< END
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
124 endfunction
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
125 END
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
126 enddef
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
127
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
128 :def Foo()
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
129 :enddef
e8ddbfaf0c85 runtime(vim): Update base-syntax, fix nested function folding (#14397)
Christian Brabandt <cb@256bit.org>
parents: 34828
diff changeset
130