Initial tree-sitter support for .scm files

cursorless-dev · May 5, 2023 · 3486f5d · 3486f5d
1 parent 96f26c3
commit 3486f5d
Show file tree

Hide file tree

Showing 15 changed files with 265 additions and 1 deletion.
diff --git a/packages/cursorless-engine/src/languages/constants.ts b/packages/cursorless-engine/src/languages/constants.ts
@@ -18,6 +18,7 @@ export const supportedLanguageIds = [
   "python",
   "ruby",
   "scala",
+  "scm",
   "scss",
   "rust",
   "typescript",

diff --git a/packages/cursorless-engine/src/languages/getNodeMatcher.ts b/packages/cursorless-engine/src/languages/getNodeMatcher.ts
@@ -52,7 +52,7 @@ export function getNodeMatcher(
 
 const languageMatchers: Record<
   SupportedLanguageId,
-  Record<SimpleScopeTypeType, NodeMatcher>
+  Partial<Record<SimpleScopeTypeType, NodeMatcher>>
 > = {
   c: cpp,
   cpp,
@@ -72,6 +72,7 @@ const languageMatchers: Record<
   python,
   ruby,
   scala,
+  scm: {},
   scss,
   rust,
   typescript,

diff --git a/packages/cursorless-engine/src/languages/getTextFragmentExtractor.ts b/packages/cursorless-engine/src/languages/getTextFragmentExtractor.ts
@@ -175,6 +175,7 @@ const textFragmentExtractors: Record<
     "scala",
     constructHackedStringTextFragmentExtractor("scala"),
   ),
+  scm: null,
   scss: constructDefaultTextFragmentExtractor(
     "scss",
     scssStringTextFragmentExtractor,

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearComment.yml
@@ -0,0 +1,22 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear comment
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: comment}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ;; aaa
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearEveryState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearEveryState.yml
@@ -0,0 +1,29 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear every state
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: {type: statement}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    (aaa) @bbb
+    ;; ccc
+    (ddd) @eee
+  selections:
+    - anchor: {line: 2, character: 10}
+      active: {line: 2, character: 10}
+  marks: {}
+finalState:
+  documentContents: |
+
+    ;; ccc
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+    - anchor: {line: 2, character: 0}
+      active: {line: 2, character: 0}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearItem.yml
@@ -0,0 +1,22 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear item
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: collectionItem}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ;; (aaa)
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
+  marks: {}
+finalState:
+  documentContents: ;; ()
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearRound.yml
@@ -0,0 +1,22 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear round
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: surroundingPair, delimiter: parentheses}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (aaa)
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearRound2.yml
@@ -0,0 +1,22 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear round
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: surroundingPair, delimiter: parentheses}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ;; (aaa)
+  selections:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
+  marks: {}
+finalState:
+  documentContents: ";; "
+  selections:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearRound3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearRound3.yml
@@ -0,0 +1,22 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear round
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: surroundingPair, delimiter: parentheses}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "\"(aaa)\" @bbb"
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: "\"\" @bbb"
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState.yml
@@ -0,0 +1,18 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear state
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ;; aaa
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState2.yml
@@ -0,0 +1,22 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear state
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (aaa) @bbb
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState3.yml
@@ -0,0 +1,26 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear state
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    (
+        (aaa) @bbb
+        (#ccc? @bbb)
+    )
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState4.yml
@@ -0,0 +1,26 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear state
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    (
+        (aaa) @bbb
+        (#ccc? @bbb)
+    )
+  selections:
+    - anchor: {line: 2, character: 4}
+      active: {line: 2, character: 4}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scm/clearState5.yml
@@ -0,0 +1,22 @@
+languageId: scm
+command:
+  version: 5
+  spokenForm: clear state
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "[(aaa) (bbb)] @ccc"
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
diff --git a/queries/scm.scm b/queries/scm.scm
@@ -0,0 +1,8 @@
+(
+  (program
+    (_) @statement
+  ) @_.iteration
+  (#not-type? @statement comment)
+)
+(comment) @comment @textFragment
+(anonymous_node) @string @textFragment