Mercurial > vim

comparison src/testdir/test_vim9_cmd.vim @ 22425:eabc059a6ac4 v8.2.1761

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1761: Vim9: Some tests are still using :let Commit: https://github.com/vim/vim/commit/ac564082f118ccdca828980c5f10b65a40bffb4d Author: Bram Moolenaar <Bram@vim.org> Date: Sun Sep 27 19:05:33 2020 +0200 patch 8.2.1761: Vim9: Some tests are still using :let Problem: Vim9: Some tests are still using :let. Solution: Change more declarations to use :var.
author Bram Moolenaar <Bram@vim.org>
date Sun, 27 Sep 2020 19:15:03 +0200
parents 4c488004edbc
children 166a0f17b05e
comparison
equal deleted inserted replaced
22424:2cf3f399bedb 22425:eabc059a6ac4
2 2
3 source check.vim 3 source check.vim
4 source vim9.vim 4 source vim9.vim
5 source view_util.vim 5 source view_util.vim
6 6
7 " TODO: remove later
8 let v:disallow_let = 1
9
7 def Test_edit_wildcards() 10 def Test_edit_wildcards()
8 let filename = 'Xtest' 11 var filename = 'Xtest'
9 edit `=filename` 12 edit `=filename`
10 assert_equal('Xtest', bufname()) 13 assert_equal('Xtest', bufname())
11 14
12 let filenr = 123 15 var filenr = 123
13 edit Xtest`=filenr` 16 edit Xtest`=filenr`
14 assert_equal('Xtest123', bufname()) 17 assert_equal('Xtest123', bufname())
15 18
16 filenr = 77 19 filenr = 77
17 edit `=filename``=filenr` 20 edit `=filename``=filenr`
23 26
24 def Test_hardcopy_wildcards() 27 def Test_hardcopy_wildcards()
25 CheckUnix 28 CheckUnix
26 CheckFeature postscript 29 CheckFeature postscript
27 30
28 let outfile = 'print' 31 var outfile = 'print'
29 hardcopy > X`=outfile`.ps 32 hardcopy > X`=outfile`.ps
30 assert_true(filereadable('Xprint.ps')) 33 assert_true(filereadable('Xprint.ps'))
31 34
32 delete('Xprint.ps') 35 delete('Xprint.ps')
33 enddef 36 enddef
34 37
35 def Test_syn_include_wildcards() 38 def Test_syn_include_wildcards()
36 writefile(['syn keyword Found found'], 'Xthemine.vim') 39 writefile(['syn keyword Found found'], 'Xthemine.vim')
37 let save_rtp = &rtp 40 var save_rtp = &rtp
38 &rtp = '.' 41 &rtp = '.'
39 42
40 let fname = 'mine' 43 var fname = 'mine'
41 syn include @Group Xthe`=fname`.vim 44 syn include @Group Xthe`=fname`.vim
42 assert_match('Found.* contained found', execute('syn list Found')) 45 assert_match('Found.* contained found', execute('syn list Found'))
43 46
44 &rtp = save_rtp 47 &rtp = save_rtp
45 delete('Xthemine.vim') 48 delete('Xthemine.vim')
46 enddef 49 enddef
47 50
48 def Test_echo_linebreak() 51 def Test_echo_linebreak()
49 let lines =<< trim END 52 var lines =<< trim END
50 vim9script 53 vim9script
51 redir @a 54 redir @a
52 echo 'one' 55 echo 'one'
53 .. 'two' 56 .. 'two'
54 redir END 57 redir END
67 END 70 END
68 CheckScriptSuccess(lines) 71 CheckScriptSuccess(lines)
69 enddef 72 enddef
70 73
71 def Test_if_linebreak() 74 def Test_if_linebreak()
72 let lines =<< trim END 75 var lines =<< trim END
73 vim9script 76 vim9script
74 if 1 && 77 if 1 &&
75 2 78 2
76 || 3 79 || 3
77 g:res = 42 80 g:res = 42
96 CheckScriptSuccess(lines) 99 CheckScriptSuccess(lines)
97 unlet g:res 100 unlet g:res
98 enddef 101 enddef
99 102
100 def Test_while_linebreak() 103 def Test_while_linebreak()
101 let lines =<< trim END 104 var lines =<< trim END
102 vim9script 105 vim9script
103 let nr = 0 106 var nr = 0
104 while nr < 107 while nr <
105 10 + 3 108 10 + 3
106 nr = nr 109 nr = nr
107 + 4 110 + 4
108 endwhile 111 endwhile
110 END 113 END
111 CheckScriptSuccess(lines) 114 CheckScriptSuccess(lines)
112 115
113 lines =<< trim END 116 lines =<< trim END
114 vim9script 117 vim9script
115 let nr = 0 118 var nr = 0
116 while nr 119 while nr
117 < 120 <
118 10 121 10
119 + 122 +
120 3 123 3
126 END 129 END
127 CheckScriptSuccess(lines) 130 CheckScriptSuccess(lines)
128 enddef 131 enddef
129 132
130 def Test_for_linebreak() 133 def Test_for_linebreak()
131 let lines =<< trim END 134 var lines =<< trim END
132 vim9script 135 vim9script
133 let nr = 0 136 var nr = 0
134 for x 137 for x
135 in 138 in
136 [1, 2, 3, 4] 139 [1, 2, 3, 4]
137 nr = nr + x 140 nr = nr + x
138 endfor 141 endfor
140 END 143 END
141 CheckScriptSuccess(lines) 144 CheckScriptSuccess(lines)
142 145
143 lines =<< trim END 146 lines =<< trim END
144 vim9script 147 vim9script
145 let nr = 0 148 var nr = 0
146 for x 149 for x
147 in 150 in
148 [1, 2, 151 [1, 2,
149 3, 4 152 3, 4
150 ] 153 ]
156 END 159 END
157 CheckScriptSuccess(lines) 160 CheckScriptSuccess(lines)
158 enddef 161 enddef
159 162
160 def Test_method_call_linebreak() 163 def Test_method_call_linebreak()
161 let lines =<< trim END 164 var lines =<< trim END
162 vim9script 165 vim9script
163 let res = [] 166 var res = []
164 func RetArg( 167 func RetArg(
165 arg 168 arg
166 ) 169 )
167 let s:res = a:arg 170 let s:res = a:arg
168 endfunc 171 endfunc
173 END 176 END
174 CheckScriptSuccess(lines) 177 CheckScriptSuccess(lines)
175 enddef 178 enddef
176 179
177 def Test_dict_member() 180 def Test_dict_member()
178 let test: dict<list<number>> = {'data': [3, 1, 2]} 181 var test: dict<list<number>> = {'data': [3, 1, 2]}
179 test.data->sort() 182 test.data->sort()
180 assert_equal(#{data: [1, 2, 3]}, test) 183 assert_equal(#{data: [1, 2, 3]}, test)
181 test.data 184 test.data
182 ->reverse() 185 ->reverse()
183 assert_equal(#{data: [3, 2, 1]}, test) 186 assert_equal(#{data: [3, 2, 1]}, test)
184 187
185 let lines =<< trim END 188 var lines =<< trim END
186 vim9script 189 vim9script
187 let test: dict<list<number>> = {'data': [3, 1, 2]} 190 var test: dict<list<number>> = {'data': [3, 1, 2]}
188 test.data->sort() 191 test.data->sort()
189 assert_equal(#{data: [1, 2, 3]}, test) 192 assert_equal(#{data: [1, 2, 3]}, test)
190 END 193 END
191 CheckScriptSuccess(lines) 194 CheckScriptSuccess(lines)
192 enddef 195 enddef
193 196
194 def Test_bar_after_command() 197 def Test_bar_after_command()
195 def RedrawAndEcho() 198 def RedrawAndEcho()
196 let x = 'did redraw' 199 var x = 'did redraw'
197 redraw | echo x 200 redraw | echo x
198 enddef 201 enddef
199 RedrawAndEcho() 202 RedrawAndEcho()
200 assert_match('did redraw', Screenline(&lines)) 203 assert_match('did redraw', Screenline(&lines))
201 204
202 def CallAndEcho() 205 def CallAndEcho()
203 let x = 'did redraw' 206 var x = 'did redraw'
204 reg_executing() | echo x 207 reg_executing() | echo x
205 enddef 208 enddef
206 CallAndEcho() 209 CallAndEcho()
207 assert_match('did redraw', Screenline(&lines)) 210 assert_match('did redraw', Screenline(&lines))
208 211
230 delete('Xoutfile') 233 delete('Xoutfile')
231 endif 234 endif
232 enddef 235 enddef
233 236
234 def Test_filter_is_not_modifier() 237 def Test_filter_is_not_modifier()
235 let tags = [{'a': 1, 'b': 2}, {'x': 3, 'y': 4}] 238 var tags = [{'a': 1, 'b': 2}, {'x': 3, 'y': 4}]
236 filter(tags, { _, v -> has_key(v, 'x') ? 1 : 0 }) 239 filter(tags, { _, v -> has_key(v, 'x') ? 1 : 0 })
237 assert_equal([#{x: 3, y: 4}], tags) 240 assert_equal([#{x: 3, y: 4}], tags)
238 enddef 241 enddef
239 242
240 def Test_eval_command() 243 def Test_eval_command()
241 let from = 3 244 var from = 3
242 let to = 5 245 var to = 5
243 g:val = 111 246 g:val = 111
244 def Increment(nrs: list<number>) 247 def Increment(nrs: list<number>)
245 for nr in nrs 248 for nr in nrs
246 g:val += nr 249 g:val += nr
247 endfor 250 endfor
251 assert_equal(111 + 3 + 4 + 5, g:val) 254 assert_equal(111 + 3 + 4 + 5, g:val)
252 unlet g:val 255 unlet g:val
253 enddef 256 enddef
254 257
255 def Test_map_command() 258 def Test_map_command()
256 let lines =<< trim END 259 var lines =<< trim END
257 nnoremap <F3> :echo 'hit F3 #'<CR> 260 nnoremap <F3> :echo 'hit F3 #'<CR>
258 assert_equal(":echo 'hit F3 #'<CR>", maparg("<F3>", "n")) 261 assert_equal(":echo 'hit F3 #'<CR>", maparg("<F3>", "n"))
259 END 262 END
260 CheckDefSuccess(lines) 263 CheckDefSuccess(lines)
261 CheckScriptSuccess(['vim9script'] + lines) 264 CheckScriptSuccess(['vim9script'] + lines)
262 enddef 265 enddef
263 266
264 def Test_normal_command() 267 def Test_normal_command()
265 new 268 new
266 setline(1, 'doesnotexist') 269 setline(1, 'doesnotexist')
267 let caught = 0 270 var caught = 0
268 try 271 try
269 exe "norm! \<C-]>" 272 exe "norm! \<C-]>"
270 catch /E433/ 273 catch /E433/
271 caught = 2 274 caught = 2
272 endtry 275 endtry