Add Cursorless support for tree-sitter query `.scm` files #1448

pokey · 2023-05-05T14:53:54Z

This PR allows us to say things like "take state" when we're working on .scm files.

Depends on Fix "item" fallback for next-gen scope handlers #1763
Depends on Work around tree-sitter query search bug #1800

Checklist

I have added tests
Add trailing delimiter to "key"
File issue for "bring to name" when there are multiple names
I have updated the docs and cheatsheet
I have not broken the cheatsheet

queries/scm.scm

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

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

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

queries/scm.name.scm

queries/scm.collections.scm

queries/scm.scm

- Fixes #1609 - Required by / tested by #1448 ## 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

pokey · 2023-08-17T01:02:41Z

packages/cursorless-engine/src/languages/TreeSitterQuery/checkCaptureStartEnd.test.ts

@@ -130,7 +130,7 @@ const testCases: TestCase[] = [
  },

  {
-    name: "should show error for capture with multiple start",
+    name: "should allow capture with multiple start",


This turned out to be useful for this PR; see https://github.com/cursorless-dev/cursorless/pull/1448/files#diff-83dc43cab688debd9b40743b835d49f7a047d393df9da5bb39e354f39aa09966R86-R87

packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts

pokey · 2023-08-21T13:52:58Z

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

+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: (aaa) @


notice how "change name" targets all of them as one range. See #1631 (comment)

pokey · 2023-08-21T13:54:37Z

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

+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: "(aaa) "


I don't love this space, but I think it should probably be handled by #855

pokey · 2023-08-21T13:54:56Z

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

+      active: {line: 0, character: 20}
+  marks: {}
+finalState:
+  documentContents: "(aaa) @bbb @ccc "


as above re space

pokey · 2023-08-21T19:25:58Z

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

+          scopeType: {type: collectionItem}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ;; (aaa)


This tests #1763

pokey · 2023-08-21T20:00:59Z

queries/scm.name.scm

+;;!        *********
+;;!  --------------- <~ iteration domain


Given iteration scope is just a scope, I'd be tempted to just use the regular symbols. I figure this is fine for now because these comments are only semi-formal

josharian · 2023-08-22T01:02:47Z

pumpkin now, will look tomorrow

AndreasArvidsson · 2023-08-22T06:11:43Z

packages/common/src/extensionDependencies.ts

@@ -4,4 +4,5 @@ export const extensionDependencies = [
  "scalameta.metals",
  "ms-python.python",
  "mrob95.vscode-talonscript",
+  "jrieken.vscode-tree-sitter-query",


I'm leaning or more towards just including our own missing file extensions instead of having to add additional extension dependencies.

Agreed. Tho wrt .scm specifically, @auscompgeek makes a good point that we may want to avoid that one as it is more commonly used for Scheme. But for .talon and the others I think it makes sense for us to just register them

josharian · 2023-08-24T03:42:23Z

…and with this in, a bunch of the Go query issues I was struggling with have been resolved. Yay, thanks for paving this road!

pokey mentioned this pull request May 5, 2023

Support specifying text fragments via queries #1447

Merged

3 tasks

pokey force-pushed the base/pokey/initial-tree-sitter-support-for-scm-files branch from d71e8ca to 96f26c3 Compare May 5, 2023 15:04

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch 3 times, most recently from 3486f5d to f0de95f Compare May 5, 2023 16:11

pokey changed the base branch from base/pokey/initial-tree-sitter-support-for-scm-files to pokey/support-adding-languages-using-only-queries May 6, 2023 15:45

pokey commented May 11, 2023

View reviewed changes

queries/scm.scm Show resolved Hide resolved

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch from f0de95f to d232c0c Compare May 11, 2023 14:06

pokey force-pushed the pokey/support-adding-languages-using-only-queries branch 2 times, most recently from 57f0efd to 8ae3a2c Compare May 11, 2023 15:40

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch from d232c0c to 38c9523 Compare May 11, 2023 15:40

Base automatically changed from pokey/support-adding-languages-using-only-queries to main May 11, 2023 16:24

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch from 38c9523 to e250f98 Compare May 12, 2023 13:25

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch 3 times, most recently from 29cfe67 to f9970af Compare June 8, 2023 13:24

pokey commented Jun 8, 2023

View reviewed changes

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearEveryName.yml Outdated Show resolved Hide resolved

pokey commented Jun 8, 2023

View reviewed changes

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearValue.yml Outdated Show resolved Hide resolved

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch 2 times, most recently from 430f938 to db358bb Compare June 8, 2023 13:32

pokey commented Jun 8, 2023

View reviewed changes

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearCallee.yml Outdated Show resolved Hide resolved

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch 4 times, most recently from 0701a0c to 94f718c Compare June 8, 2023 14:26

pokey changed the title ~~Initial tree-sitter support for .scm files~~ Add Cursorless support for tree-sitter query .scm files Jun 13, 2023

pokey added the to discuss Plan to discuss at meet-up label Jun 13, 2023

pokey commented Jun 20, 2023

View reviewed changes

queries/scm.name.scm Show resolved Hide resolved

pokey commented Jun 20, 2023

View reviewed changes

queries/scm.collections.scm Show resolved Hide resolved

pokey commented Jun 20, 2023

View reviewed changes

queries/scm.scm Outdated Show resolved Hide resolved

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch 3 times, most recently from 03f50b8 to 95f982c Compare August 17, 2023 00:31

pokey mentioned this pull request Aug 17, 2023

Work around tree-sitter query search bug #1800

Merged

3 tasks

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch from 95f982c to dbf05d1 Compare August 21, 2023 13:48

pokey added 4 commits August 21, 2023 20:54

Allow multiple start / end captures

495b695

Add has-n-children-of-type? predicate

307d47b

Initial tree-sitter support for .scm files

d512d65

Treat multiple names as a single range

2cbbf6a

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch 3 times, most recently from 9f345ee to 4c7d503 Compare August 21, 2023 20:04

Add tests and comments

b78c097

pokey force-pushed the pokey/initial-tree-sitter-support-for-scm-files branch from 4c7d503 to b78c097 Compare August 21, 2023 20:09

pokey commented Aug 21, 2023

View reviewed changes

pokey requested review from AndreasArvidsson and josharian August 21, 2023 20:09

pokey marked this pull request as ready for review August 21, 2023 20:10

AndreasArvidsson reviewed Aug 22, 2023

View reviewed changes

AndreasArvidsson approved these changes Aug 22, 2023

View reviewed changes

has-n-children-of-type => has-multiple-children-of-type

ab282e6

pokey enabled auto-merge August 22, 2023 12:33

pokey added this pull request to the merge queue Aug 22, 2023

Merged via the queue into main with commit 2bc7a94 Aug 22, 2023
14 checks passed

pokey deleted the pokey/initial-tree-sitter-support-for-scm-files branch August 22, 2023 13:00

pokey mentioned this pull request Sep 9, 2023

Add language support for tree-sitter query files #621

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Cursorless support for tree-sitter query `.scm` files #1448

Add Cursorless support for tree-sitter query `.scm` files #1448

pokey commented May 5, 2023 •

edited

Loading

pokey Aug 17, 2023

pokey Aug 21, 2023

pokey Aug 21, 2023

pokey Aug 21, 2023

pokey Aug 21, 2023

pokey Aug 21, 2023

josharian commented Aug 22, 2023

AndreasArvidsson Aug 22, 2023

pokey Aug 22, 2023

josharian commented Aug 24, 2023

Add Cursorless support for tree-sitter query .scm files #1448

Add Cursorless support for tree-sitter query .scm files #1448

Conversation

pokey commented May 5, 2023 • edited Loading

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

josharian commented Aug 22, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

josharian commented Aug 24, 2023

Add Cursorless support for tree-sitter query `.scm` files #1448

Add Cursorless support for tree-sitter query `.scm` files #1448

pokey commented May 5, 2023 •

edited

Loading