Skip to content

Commit 0d3caa0

Browse files
committed
Remove @name from @namedFunction
1 parent fc12f2f commit 0d3caa0

File tree

1 file changed

+82
-82
lines changed

1 file changed

+82
-82
lines changed

queries/haskell.namedFunction.scm

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818
;; ... without SIGNATURE and with SINGLE declaration
1919
(
2020
(function
21-
name: (variable) @functionName @name @_end_name
21+
name: (variable) @functionName @_start_name @_end_name
2222
;; 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)`
2424
;; 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)
2727
)
2828
;; ... with SIGNATURE and/or MULTIPLE declarations
2929
(
3030
[
3131
(
3232
(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)
3636
)
3737
(
3838
(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)
4242
)
4343
]
4444
.
@@ -47,8 +47,8 @@
4747
(
4848
(function
4949
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)
5252
)
5353
)
5454
]
@@ -63,7 +63,7 @@
6363
(function
6464
name: (variable) @_next
6565
)
66-
(#not-eq? @_next @name)
66+
(#not-eq? @_next @_start_name)
6767
)
6868
]
6969
)
@@ -75,24 +75,24 @@
7575
;; ... without SIGNATURE and with SINGLE declaration
7676
(
7777
(function
78-
name: (variable) @functionName @name @_end_name
78+
name: (variable) @functionName @_start_name @_end_name
7979
;; 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)`
8181
;; is ALWAYS evaluated, so if we don't set `@_end_name`, it fails.
82-
) @namedFunction @functionName.domain @name.domain
82+
) @namedFunction @functionName.domain
8383
)
8484
;; ... with SIGNATURE and/or MULTIPLE declarations
8585
(
8686
[
8787
(
8888
(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
9191
)
9292
(
9393
(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
9696
)
9797
]
9898
.
@@ -101,8 +101,8 @@
101101
(
102102
(function
103103
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)
106106
)
107107
)
108108
]
@@ -117,7 +117,7 @@
117117
(function
118118
name: (variable) @_next
119119
)
120-
(#not-eq? @_next @name)
120+
(#not-eq? @_next @_start_name)
121121
)
122122
]
123123
)
@@ -140,12 +140,12 @@
140140
;; function declaration
141141
(
142142
(function
143-
name: (variable) @functionName @name @_end_name
143+
name: (variable) @functionName @_start_name @_end_name
144144
;; 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)`
146146
;; 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)
149149
)
150150
.
151151
)
@@ -169,15 +169,15 @@
169169
[
170170
(
171171
(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)
175175
)
176176
(
177177
(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)
181181
)
182182
]
183183
.
@@ -186,8 +186,8 @@
186186
(
187187
(function
188188
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)
191191
)
192192
.
193193
)
@@ -209,15 +209,15 @@
209209
[
210210
(
211211
(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)
215215
)
216216
(
217217
(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)
221221
)
222222
]
223223
.
@@ -226,8 +226,8 @@
226226
(
227227
(function
228228
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)
231231
)
232232
.
233233
)
@@ -237,8 +237,8 @@
237237
.
238238
;; function declaration
239239
(function
240-
name: (variable) @functionName @name
241-
) @namedFunction @functionName.domain @name.domain
240+
name: (variable) @functionName @_start_name
241+
) @namedFunction @functionName.domain
242242
.
243243
)
244244
;; ... as the ONLY in the file
@@ -249,13 +249,13 @@
249249
[
250250
(
251251
(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
254254
)
255255
(
256256
(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
259259
)
260260
]
261261
.
@@ -264,8 +264,8 @@
264264
(
265265
(function
266266
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)
269269
)
270270
.
271271
)
@@ -277,24 +277,24 @@
277277
;; ... without SIGNATURE and with SINGLE declaration
278278
(
279279
(function
280-
name: (variable) @functionName @name @_end_name
280+
name: (variable) @functionName @_start_name @_end_name
281281
;; 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)`
283283
;; is ALWAYS evaluated, so if we don't set `@_end_name`, it fails.
284-
) @namedFunction @functionName.domain @name.domain
284+
) @namedFunction @functionName.domain
285285
)
286286
;; ... with SIGNATURE and/or MULTIPLE declarations
287287
(
288288
[
289289
(
290290
(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
293293
)
294294
(
295295
(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
298298
)
299299
]
300300
.
@@ -303,8 +303,8 @@
303303
(
304304
(function
305305
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)
308308
)
309309
)
310310
]
@@ -319,7 +319,7 @@
319319
(function
320320
name: (variable) @_next
321321
)
322-
(#not-eq? @_next @name)
322+
(#not-eq? @_next @_start_name)
323323
)
324324
]
325325
)
@@ -342,12 +342,12 @@
342342
;; function declaration
343343
(
344344
(function
345-
name: (variable) @functionName @name @_end_name
345+
name: (variable) @functionName @_start_name @_end_name
346346
;; 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)`
348348
;; 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)
351351
)
352352
.
353353
)
@@ -372,15 +372,15 @@
372372
[
373373
(
374374
(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)
378378
)
379379
(
380380
(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)
384384
)
385385
]
386386
.
@@ -389,8 +389,8 @@
389389
(
390390
(function
391391
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)
394394
)
395395
)
396396
.
@@ -402,11 +402,11 @@
402402
;; function declaration
403403
(
404404
(function
405-
name: (variable) @functionName @name @_end_name
405+
name: (variable) @functionName @_start_name @_end_name
406406
;; 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)`
408408
;; is ALWAYS evaluated, so if we don't set `@_end_name`, it fails.
409-
) @namedFunction @functionName.domain @name.domain
409+
) @namedFunction @functionName.domain
410410
)
411411
.
412412
)
@@ -418,13 +418,13 @@
418418
[
419419
(
420420
(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
423423
)
424424
(
425425
(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
428428
)
429429
]
430430
.
@@ -433,8 +433,8 @@
433433
(
434434
(function
435435
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)
438438
)
439439
.
440440
)

0 commit comments

Comments
 (0)