Skip to content

Commit c538a23

Browse files
pokeyfidgetingbits
pokey
authored and
fidgetingbits
committed
Include @ in name for scm language (cursorless-dev#1927)
Fixes cursorless-dev#1923 ## Checklist - [ ] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [ ] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet) - [ ] I have not broken the cheatsheet
1 parent 3dd52d9 commit c538a23

21 files changed

+64
-80
lines changed

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/changeEveryName.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ initialState:
1717
active: {line: 0, character: 0}
1818
marks: {}
1919
finalState:
20-
documentContents: (aaa) @ @ @
20+
documentContents: "(aaa) "
2121
selections:
22+
- anchor: {line: 0, character: 6}
23+
active: {line: 0, character: 6}
2224
- anchor: {line: 0, character: 7}
2325
active: {line: 0, character: 7}
24-
- anchor: {line: 0, character: 9}
25-
active: {line: 0, character: 9}
26-
- anchor: {line: 0, character: 11}
27-
active: {line: 0, character: 11}
26+
- anchor: {line: 0, character: 8}
27+
active: {line: 0, character: 8}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/changeName.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ initialState:
1717
active: {line: 0, character: 0}
1818
marks: {}
1919
finalState:
20-
documentContents: (aaa) @
20+
documentContents: "(aaa) "
2121
selections:
22-
- anchor: {line: 0, character: 7}
23-
active: {line: 0, character: 7}
22+
- anchor: {line: 0, character: 6}
23+
active: {line: 0, character: 6}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/changeName2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ initialState:
1717
active: {line: 0, character: 0}
1818
marks: {}
1919
finalState:
20-
documentContents: "eee: (aaa) @"
20+
documentContents: "eee: (aaa) "
2121
selections:
22-
- anchor: {line: 0, character: 12}
23-
active: {line: 0, character: 12}
22+
- anchor: {line: 0, character: 11}
23+
active: {line: 0, character: 11}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/changeName3.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ initialState:
1717
active: {line: 0, character: 0}
1818
marks: {}
1919
finalState:
20-
documentContents: "eee: _ @"
20+
documentContents: "eee: _ "
2121
selections:
22-
- anchor: {line: 0, character: 8}
23-
active: {line: 0, character: 8}
22+
- anchor: {line: 0, character: 7}
23+
active: {line: 0, character: 7}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/chuckName.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ initialState:
1717
active: {line: 0, character: 0}
1818
marks: {}
1919
finalState:
20-
documentContents: "(aaa) "
20+
documentContents: (aaa)
2121
selections:
2222
- anchor: {line: 0, character: 0}
2323
active: {line: 0, character: 0}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/chuckName2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ initialState:
1717
active: {line: 0, character: 20}
1818
marks: {}
1919
finalState:
20-
documentContents: "(aaa) @bbb @ccc "
20+
documentContents: (aaa) @bbb @ccc
2121
selections:
22-
- anchor: {line: 0, character: 16}
23-
active: {line: 0, character: 16}
22+
- anchor: {line: 0, character: 15}
23+
active: {line: 0, character: 15}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearEveryName.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ initialState:
1616
active: {line: 0, character: 0}
1717
marks: {}
1818
finalState:
19-
documentContents: (aaa) @ @
19+
documentContents: "(aaa) "
2020
selections:
21+
- anchor: {line: 0, character: 6}
22+
active: {line: 0, character: 6}
2123
- anchor: {line: 0, character: 7}
2224
active: {line: 0, character: 7}
23-
- anchor: {line: 0, character: 9}
24-
active: {line: 0, character: 9}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearEveryName2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ initialState:
1616
active: {line: 0, character: 0}
1717
marks: {}
1818
finalState:
19-
documentContents: "[(aaa) (bbb)] @ @"
19+
documentContents: "[(aaa) (bbb)] "
2020
selections:
21+
- anchor: {line: 0, character: 14}
22+
active: {line: 0, character: 14}
2123
- anchor: {line: 0, character: 15}
2224
active: {line: 0, character: 15}
23-
- anchor: {line: 0, character: 17}
24-
active: {line: 0, character: 17}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearEveryName3.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ initialState:
2121
finalState:
2222
documentContents: |-
2323
(anonymous_node
24-
name: (_) @ @
24+
name: (_)
2525
)
2626
selections:
27+
- anchor: {line: 1, character: 12}
28+
active: {line: 1, character: 12}
2729
- anchor: {line: 1, character: 13}
2830
active: {line: 1, character: 13}
29-
- anchor: {line: 1, character: 15}
30-
active: {line: 1, character: 15}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearName.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ initialState:
1616
active: {line: 0, character: 0}
1717
marks: {}
1818
finalState:
19-
documentContents: (aaa) @
19+
documentContents: "(aaa) "
2020
selections:
21-
- anchor: {line: 0, character: 7}
22-
active: {line: 0, character: 7}
21+
- anchor: {line: 0, character: 6}
22+
active: {line: 0, character: 6}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearName2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ initialState:
1616
active: {line: 0, character: 11}
1717
marks: {}
1818
finalState:
19-
documentContents: (aaa) @bbb @
19+
documentContents: "(aaa) @bbb "
2020
selections:
21-
- anchor: {line: 0, character: 12}
22-
active: {line: 0, character: 12}
21+
- anchor: {line: 0, character: 11}
22+
active: {line: 0, character: 11}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearName3.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ initialState:
1616
active: {line: 0, character: 0}
1717
marks: {}
1818
finalState:
19-
documentContents: (aaa) @
19+
documentContents: "(aaa) "
2020
selections:
21-
- anchor: {line: 0, character: 7}
22-
active: {line: 0, character: 7}
21+
- anchor: {line: 0, character: 6}
22+
active: {line: 0, character: 6}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearName4.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ initialState:
1616
active: {line: 0, character: 0}
1717
marks: {}
1818
finalState:
19-
documentContents: "\"aaa\" @"
19+
documentContents: "\"aaa\" "
2020
selections:
21-
- anchor: {line: 0, character: 7}
22-
active: {line: 0, character: 7}
21+
- anchor: {line: 0, character: 6}
22+
active: {line: 0, character: 6}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearName5.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ initialState:
1616
active: {line: 0, character: 0}
1717
marks: {}
1818
finalState:
19-
documentContents: "[(aaa) (bbb)] @"
19+
documentContents: "[(aaa) (bbb)] "
2020
selections:
21-
- anchor: {line: 0, character: 15}
22-
active: {line: 0, character: 15}
21+
- anchor: {line: 0, character: 14}
22+
active: {line: 0, character: 14}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearName6.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ finalState:
2323
documentContents: |-
2424
2525
(anonymous_node
26-
name: (_) @
26+
name: (_)
2727
)
2828
selections:
29-
- anchor: {line: 2, character: 13}
30-
active: {line: 2, character: 13}
29+
- anchor: {line: 2, character: 12}
30+
active: {line: 2, character: 12}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearName7.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ initialState:
2121
finalState:
2222
documentContents: |-
2323
(anonymous_node
24-
name: (_) @
24+
name: (_)
2525
)
2626
selections:
27-
- anchor: {line: 1, character: 13}
28-
active: {line: 1, character: 13}
27+
- anchor: {line: 1, character: 12}
28+
active: {line: 1, character: 12}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/drinkName.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ initialState:
1717
active: {line: 0, character: 0}
1818
marks: {}
1919
finalState:
20-
documentContents: "eee: _ @ @bbb @ccc"
20+
documentContents: "eee: _ @bbb @ccc"
2121
selections:
22-
- anchor: {line: 0, character: 8}
23-
active: {line: 0, character: 8}
22+
- anchor: {line: 0, character: 7}
23+
active: {line: 0, character: 7}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/pourName.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ initialState:
1717
active: {line: 0, character: 0}
1818
marks: {}
1919
finalState:
20-
documentContents: "eee: _ @bbb @ccc @"
20+
documentContents: "eee: _ @bbb @ccc "
2121
selections:
22-
- anchor: {line: 0, character: 18}
23-
active: {line: 0, character: 18}
22+
- anchor: {line: 0, character: 17}
23+
active: {line: 0, character: 17}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/pourName2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ initialState:
1717
active: {line: 0, character: 7}
1818
marks: {}
1919
finalState:
20-
documentContents: "eee: _ @bbb @ @ccc"
20+
documentContents: "eee: _ @bbb @ccc"
2121
selections:
22-
- anchor: {line: 0, character: 13}
23-
active: {line: 0, character: 13}
22+
- anchor: {line: 0, character: 12}
23+
active: {line: 0, character: 12}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/takeName.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ initialState:
1919
finalState:
2020
documentContents: (aaa) @bbb @ccc @ddd
2121
selections:
22-
- anchor: {line: 0, character: 7}
22+
- anchor: {line: 0, character: 6}
2323
active: {line: 0, character: 20}

‎queries/scm.name.scm

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,43 @@
11
;;!! (aaa) @bbb @ccc
2-
;;! ^^^^^^^^
3-
;;! xxxxxxxxx
2+
;;! ^^^^^^^^^
43
;;! ---------------
54
(
65
(_
76
_ @dummy
87
.
9-
(capture
10-
"@" @_.leading
11-
name: (identifier) @name.start
12-
)
8+
(capture) @name.start
139
(capture)? @name.end
1410
.
1511
) @_.domain
1612
(#not-type? @_.domain parameters)
1713
(#not-type? @dummy capture)
1814
(#not-parent-type? @_.domain field_definition)
19-
(#insertion-delimiter! @name.start " @")
2015
)
2116

2217
;;!! eee: (aaa) @bbb @ccc
23-
;;! ^^^^^^^^
24-
;;! xxxxxxxxx
18+
;;! ^^^^^^^^^
2519
;;! --------------------
2620
(
2721
(field_definition
2822
(_
2923
_ @dummy
3024
.
31-
(capture
32-
"@" @_.leading
33-
name: (identifier) @name.start
34-
)
25+
(capture) @name.start
3526
(capture)? @name.end
3627
.
3728
)
3829
) @_.domain
3930
(#not-type? @dummy capture)
40-
(#insertion-delimiter! @name.start " @")
4131
)
4232

4333
;;!! (aaa) @bbb @ccc
44-
;;! ^^^ ^^^
45-
;;! xxxx xxxx
46-
;;! ---- ----
34+
;;! ^^^^ ^^^^
4735
(
4836
(_
49-
(capture
50-
"@" @_.leading
51-
name: (identifier) @name
52-
) @_.domain
37+
(capture) @name
5338
) @dummy
5439
(#not-type? @dummy parameters)
5540
(#has-multiple-children-of-type? @dummy capture)
56-
(#insertion-delimiter! @name " @")
5741
)
5842

5943
;;!! (aaa) @bbb @ccc

0 commit comments

Comments
 (0)