Merge remote-tracking branch 'upstream/main' into nvim-talon

.vscode/extensions.json

@@ -7,6 +7,7 @@
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
     "jrieken.vscode-tree-sitter-query",
-    "wenkokke.tree-sitter-talon"
+    "wenkokke.tree-sitter-talon",
+    "usernamehw.commands"
   ]
 }

data/fixtures/recorded/languages/ruby/changeRound3.yml

@@ -0,0 +1,23 @@
+languageId: ruby
+command:
+  version: 7
+  spokenForm: change round
+  action:
+    name: clearAndSetSelection
+    target:
+      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: 2}
+      active: {line: 0, character: 2}

data/fixtures/scopes/c/comment.line.scope

@@ -0,0 +1,17 @@
+int a; // the comment
+---
+
+[Content] =
+[Domain] = 0:7-0:21
+         >--------------<
+0| int a; // the comment
+
+[Removal] = 0:6-0:21
+        >---------------<
+0| int a; // the comment
+
+[Leading delimiter] = 0:6-0:7
+        >-<
+0| int a; // the comment
+
+[Insertion delimiter] = "\n"

data/fixtures/scopes/c/ifStatement.scope

@@ -0,0 +1,19 @@
+void func() {
+    if (true) { }
+}
+---
+
+[Content] =
+[Domain] = 1:4-1:17
+      >-------------<
+1|     if (true) { }
+
+[Removal] = 1:0-1:17
+  >-----------------<
+1|     if (true) { }
+
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     if (true) { }
+
+[Insertion delimiter] = "\n"