|
18 | 18 | ;; ... without SIGNATURE and with SINGLE declaration |
19 | 19 | ( |
20 | 20 | (function |
21 | | - name: (variable) @functionName @name @_end_name |
| 21 | + name: (variable) @functionName @_start_name @_end_name |
22 | 22 | ;; The annotation `@_end_name` is REQUIRED because assertions are |
23 | | - ;; hoisted, which means that the assertion `(#eq? @name @_end_name)` |
| 23 | + ;; hoisted, which means that the assertion `(#eq? @_start_name @_end_name)` |
24 | 24 | ;; is ALWAYS evaluated, so if we don't set `@_end_name`, it fails. |
25 | | - ) @namedFunction @functionName.domain @name.domain |
26 | | - (#not-eq? @_previous @name) |
| 25 | + ) @namedFunction @functionName.domain |
| 26 | + (#not-eq? @_previous @_start_name) |
27 | 27 | ) |
28 | 28 | ;; ... with SIGNATURE and/or MULTIPLE declarations |
29 | 29 | ( |
30 | 30 | [ |
31 | 31 | ( |
32 | 32 | (signature |
33 | | - name: (variable) @functionName @name |
34 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
35 | | - (#not-eq? @_previous @name) |
| 33 | + name: (variable) @functionName @_start_name |
| 34 | + ) @namedFunction.start @functionName.domain.start |
| 35 | + (#not-eq? @_previous @_start_name) |
36 | 36 | ) |
37 | 37 | ( |
38 | 38 | (function |
39 | | - name: (variable) @functionName @name |
40 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
41 | | - (#not-eq? @_previous @name) |
| 39 | + name: (variable) @functionName @_start_name |
| 40 | + ) @namedFunction.start @functionName.domain.start |
| 41 | + (#not-eq? @_previous @_start_name) |
42 | 42 | ) |
43 | 43 | ] |
44 | 44 | . |
|
47 | 47 | ( |
48 | 48 | (function |
49 | 49 | name: (variable) @_end_name |
50 | | - ) @namedFunction.end @functionName.domain.end @name.domain.end |
51 | | - (#eq? @name @_end_name) |
| 50 | + ) @namedFunction.end @functionName.domain.end |
| 51 | + (#eq? @_start_name @_end_name) |
52 | 52 | ) |
53 | 53 | ) |
54 | 54 | ] |
|
63 | 63 | (function |
64 | 64 | name: (variable) @_next |
65 | 65 | ) |
66 | | - (#not-eq? @_next @name) |
| 66 | + (#not-eq? @_next @_start_name) |
67 | 67 | ) |
68 | 68 | ] |
69 | 69 | ) |
|
75 | 75 | ;; ... without SIGNATURE and with SINGLE declaration |
76 | 76 | ( |
77 | 77 | (function |
78 | | - name: (variable) @functionName @name @_end_name |
| 78 | + name: (variable) @functionName @_start_name @_end_name |
79 | 79 | ;; The annotation `@_end_name` is REQUIRED because assertions are |
80 | | - ;; hoisted, which means that the assertion `(#eq? @name @_end_name)` |
| 80 | + ;; hoisted, which means that the assertion `(#eq? @_start_name @_end_name)` |
81 | 81 | ;; is ALWAYS evaluated, so if we don't set `@_end_name`, it fails. |
82 | | - ) @namedFunction @functionName.domain @name.domain |
| 82 | + ) @namedFunction @functionName.domain |
83 | 83 | ) |
84 | 84 | ;; ... with SIGNATURE and/or MULTIPLE declarations |
85 | 85 | ( |
86 | 86 | [ |
87 | 87 | ( |
88 | 88 | (signature |
89 | | - name: (variable) @functionName @name |
90 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
| 89 | + name: (variable) @functionName @_start_name |
| 90 | + ) @namedFunction.start @functionName.domain.start |
91 | 91 | ) |
92 | 92 | ( |
93 | 93 | (function |
94 | | - name: (variable) @functionName @name |
95 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
| 94 | + name: (variable) @functionName @_start_name |
| 95 | + ) @namedFunction.start @functionName.domain.start |
96 | 96 | ) |
97 | 97 | ] |
98 | 98 | . |
|
101 | 101 | ( |
102 | 102 | (function |
103 | 103 | name: (variable) @_end_name |
104 | | - ) @namedFunction.end @functionName.domain.end @name.domain.end |
105 | | - (#eq? @name @_end_name) |
| 104 | + ) @namedFunction.end @functionName.domain.end |
| 105 | + (#eq? @_start_name @_end_name) |
106 | 106 | ) |
107 | 107 | ) |
108 | 108 | ] |
|
117 | 117 | (function |
118 | 118 | name: (variable) @_next |
119 | 119 | ) |
120 | | - (#not-eq? @_next @name) |
| 120 | + (#not-eq? @_next @_start_name) |
121 | 121 | ) |
122 | 122 | ] |
123 | 123 | ) |
|
140 | 140 | ;; function declaration |
141 | 141 | ( |
142 | 142 | (function |
143 | | - name: (variable) @functionName @name @_end_name |
| 143 | + name: (variable) @functionName @_start_name @_end_name |
144 | 144 | ;; The annotation `@_end_name` is REQUIRED because assertions are |
145 | | - ;; hoisted, which means that the assertion `(#eq? @name @_end_name)` |
| 145 | + ;; hoisted, which means that the assertion `(#eq? @_start_name @_end_name)` |
146 | 146 | ;; is ALWAYS evaluated, so if we don't set `@_end_name`, it fails. |
147 | | - ) @namedFunction @functionName.domain @name.domain |
148 | | - (#not-eq? @_previous @name) |
| 147 | + ) @namedFunction @functionName.domain |
| 148 | + (#not-eq? @_previous @_start_name) |
149 | 149 | ) |
150 | 150 | . |
151 | 151 | ) |
|
169 | 169 | [ |
170 | 170 | ( |
171 | 171 | (signature |
172 | | - name: (variable) @functionName @name |
173 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
174 | | - (#not-eq? @_previous @name) |
| 172 | + name: (variable) @functionName @_start_name |
| 173 | + ) @namedFunction.start @functionName.domain.start |
| 174 | + (#not-eq? @_previous @_start_name) |
175 | 175 | ) |
176 | 176 | ( |
177 | 177 | (function |
178 | | - name: (variable) @functionName @name |
179 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
180 | | - (#not-eq? @_previous @name) |
| 178 | + name: (variable) @functionName @_start_name |
| 179 | + ) @namedFunction.start @functionName.domain.start |
| 180 | + (#not-eq? @_previous @_start_name) |
181 | 181 | ) |
182 | 182 | ] |
183 | 183 | . |
|
186 | 186 | ( |
187 | 187 | (function |
188 | 188 | name: (variable) @_end_name |
189 | | - ) @namedFunction.end @functionName.domain.end @name.domain.end |
190 | | - (#eq? @name @_end_name) |
| 189 | + ) @namedFunction.end @functionName.domain.end |
| 190 | + (#eq? @_start_name @_end_name) |
191 | 191 | ) |
192 | 192 | . |
193 | 193 | ) |
|
209 | 209 | [ |
210 | 210 | ( |
211 | 211 | (signature |
212 | | - name: (variable) @functionName @name |
213 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
214 | | - (#not-eq? @_previous @name) |
| 212 | + name: (variable) @functionName @_start_name |
| 213 | + ) @namedFunction.start @functionName.domain.start |
| 214 | + (#not-eq? @_previous @_start_name) |
215 | 215 | ) |
216 | 216 | ( |
217 | 217 | (function |
218 | | - name: (variable) @functionName @name |
219 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
220 | | - (#not-eq? @_previous @name) |
| 218 | + name: (variable) @functionName @_start_name |
| 219 | + ) @namedFunction.start @functionName.domain.start |
| 220 | + (#not-eq? @_previous @_start_name) |
221 | 221 | ) |
222 | 222 | ] |
223 | 223 | . |
|
226 | 226 | ( |
227 | 227 | (function |
228 | 228 | name: (variable) @_end_name |
229 | | - ) @namedFunction.end @functionName.domain.end @name.domain.end |
230 | | - (#eq? @name @_end_name) |
| 229 | + ) @namedFunction.end @functionName.domain.end |
| 230 | + (#eq? @_start_name @_end_name) |
231 | 231 | ) |
232 | 232 | . |
233 | 233 | ) |
|
237 | 237 | . |
238 | 238 | ;; function declaration |
239 | 239 | (function |
240 | | - name: (variable) @functionName @name |
241 | | - ) @namedFunction @functionName.domain @name.domain |
| 240 | + name: (variable) @functionName @_start_name |
| 241 | + ) @namedFunction @functionName.domain |
242 | 242 | . |
243 | 243 | ) |
244 | 244 | ;; ... as the ONLY in the file |
|
249 | 249 | [ |
250 | 250 | ( |
251 | 251 | (signature |
252 | | - name: (variable) @functionName @name |
253 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
| 252 | + name: (variable) @functionName @_start_name |
| 253 | + ) @namedFunction.start @functionName.domain.start |
254 | 254 | ) |
255 | 255 | ( |
256 | 256 | (function |
257 | | - name: (variable) @functionName @name |
258 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
| 257 | + name: (variable) @functionName @_start_name |
| 258 | + ) @namedFunction.start @functionName.domain.start |
259 | 259 | ) |
260 | 260 | ] |
261 | 261 | . |
|
264 | 264 | ( |
265 | 265 | (function |
266 | 266 | name: (variable) @_end_name |
267 | | - ) @namedFunction.end @functionName.domain.end @name.domain.end |
268 | | - (#eq? @name @_end_name) |
| 267 | + ) @namedFunction.end @functionName.domain.end |
| 268 | + (#eq? @_start_name @_end_name) |
269 | 269 | ) |
270 | 270 | . |
271 | 271 | ) |
|
277 | 277 | ;; ... without SIGNATURE and with SINGLE declaration |
278 | 278 | ( |
279 | 279 | (function |
280 | | - name: (variable) @functionName @name @_end_name |
| 280 | + name: (variable) @functionName @_start_name @_end_name |
281 | 281 | ;; The annotation `@_end_name` is REQUIRED because assertions are |
282 | | - ;; hoisted, which means that the assertion `(#eq? @name @_end_name)` |
| 282 | + ;; hoisted, which means that the assertion `(#eq? @_start_name @_end_name)` |
283 | 283 | ;; is ALWAYS evaluated, so if we don't set `@_end_name`, it fails. |
284 | | - ) @namedFunction @functionName.domain @name.domain |
| 284 | + ) @namedFunction @functionName.domain |
285 | 285 | ) |
286 | 286 | ;; ... with SIGNATURE and/or MULTIPLE declarations |
287 | 287 | ( |
288 | 288 | [ |
289 | 289 | ( |
290 | 290 | (signature |
291 | | - name: (variable) @functionName @name |
292 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
| 291 | + name: (variable) @functionName @_start_name |
| 292 | + ) @namedFunction.start @functionName.domain.start |
293 | 293 | ) |
294 | 294 | ( |
295 | 295 | (function |
296 | | - name: (variable) @functionName @name |
297 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
| 296 | + name: (variable) @functionName @_start_name |
| 297 | + ) @namedFunction.start @functionName.domain.start |
298 | 298 | ) |
299 | 299 | ] |
300 | 300 | . |
|
303 | 303 | ( |
304 | 304 | (function |
305 | 305 | name: (variable) @_end_name |
306 | | - ) @namedFunction.end @functionName.domain.end @name.domain.end |
307 | | - (#eq? @name @_end_name) |
| 306 | + ) @namedFunction.end @functionName.domain.end |
| 307 | + (#eq? @_start_name @_end_name) |
308 | 308 | ) |
309 | 309 | ) |
310 | 310 | ] |
|
319 | 319 | (function |
320 | 320 | name: (variable) @_next |
321 | 321 | ) |
322 | | - (#not-eq? @_next @name) |
| 322 | + (#not-eq? @_next @_start_name) |
323 | 323 | ) |
324 | 324 | ] |
325 | 325 | ) |
|
342 | 342 | ;; function declaration |
343 | 343 | ( |
344 | 344 | (function |
345 | | - name: (variable) @functionName @name @_end_name |
| 345 | + name: (variable) @functionName @_start_name @_end_name |
346 | 346 | ;; The annotation `@_end_name` is REQUIRED because assertions are |
347 | | - ;; hoisted, which means that the assertion `(#eq? @name @_end_name)` |
| 347 | + ;; hoisted, which means that the assertion `(#eq? @_start_name @_end_name)` |
348 | 348 | ;; is ALWAYS evaluated, so if we don't set `@_end_name`, it fails. |
349 | | - ) @namedFunction @functionName.domain @name.domain |
350 | | - (#not-eq? @_previous @name) |
| 349 | + ) @namedFunction @functionName.domain |
| 350 | + (#not-eq? @_previous @_start_name) |
351 | 351 | ) |
352 | 352 | . |
353 | 353 | ) |
|
372 | 372 | [ |
373 | 373 | ( |
374 | 374 | (signature |
375 | | - name: (variable) @functionName @name |
376 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
377 | | - (#not-eq? @_previous @name) |
| 375 | + name: (variable) @functionName @_start_name |
| 376 | + ) @namedFunction.start @functionName.domain.start |
| 377 | + (#not-eq? @_previous @_start_name) |
378 | 378 | ) |
379 | 379 | ( |
380 | 380 | (function |
381 | | - name: (variable) @functionName @name |
382 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
383 | | - (#not-eq? @_previous @name) |
| 381 | + name: (variable) @functionName @_start_name |
| 382 | + ) @namedFunction.start @functionName.domain.start |
| 383 | + (#not-eq? @_previous @_start_name) |
384 | 384 | ) |
385 | 385 | ] |
386 | 386 | . |
|
389 | 389 | ( |
390 | 390 | (function |
391 | 391 | name: (variable) @_end_name |
392 | | - ) @namedFunction.end @functionName.domain.end @name.domain.end |
393 | | - (#eq? @name @_end_name) |
| 392 | + ) @namedFunction.end @functionName.domain.end |
| 393 | + (#eq? @_start_name @_end_name) |
394 | 394 | ) |
395 | 395 | ) |
396 | 396 | . |
|
402 | 402 | ;; function declaration |
403 | 403 | ( |
404 | 404 | (function |
405 | | - name: (variable) @functionName @name @_end_name |
| 405 | + name: (variable) @functionName @_start_name @_end_name |
406 | 406 | ;; The annotation `@_end_name` is REQUIRED because assertions are |
407 | | - ;; hoisted, which means that the assertion `(#eq? @name @_end_name)` |
| 407 | + ;; hoisted, which means that the assertion `(#eq? @_start_name @_end_name)` |
408 | 408 | ;; is ALWAYS evaluated, so if we don't set `@_end_name`, it fails. |
409 | | - ) @namedFunction @functionName.domain @name.domain |
| 409 | + ) @namedFunction @functionName.domain |
410 | 410 | ) |
411 | 411 | . |
412 | 412 | ) |
|
418 | 418 | [ |
419 | 419 | ( |
420 | 420 | (signature |
421 | | - name: (variable) @functionName @name |
422 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
| 421 | + name: (variable) @functionName @_start_name |
| 422 | + ) @namedFunction.start @functionName.domain.start |
423 | 423 | ) |
424 | 424 | ( |
425 | 425 | (function |
426 | | - name: (variable) @functionName @name |
427 | | - ) @namedFunction.start @functionName.domain.start @name.domain.start |
| 426 | + name: (variable) @functionName @_start_name |
| 427 | + ) @namedFunction.start @functionName.domain.start |
428 | 428 | ) |
429 | 429 | ] |
430 | 430 | . |
|
433 | 433 | ( |
434 | 434 | (function |
435 | 435 | name: (variable) @_end_name |
436 | | - ) @namedFunction.end @functionName.domain.end @name.domain.end |
437 | | - (#eq? @name @_end_name) |
| 436 | + ) @namedFunction.end @functionName.domain.end |
| 437 | + (#eq? @_start_name @_end_name) |
438 | 438 | ) |
439 | 439 | . |
440 | 440 | ) |
0 commit comments