Merge branch 'main' of https://github.com/rinOfTheStars/cursorless

Author: rinOfTheStars

…recorded/languages/cpp/takeAttribute.yml …ecorded/languages/cpp/clearAttribute.ymldata/fixtures/recorded/languages/cpp/takeAttribute.yml renamed to data/fixtures/recorded/languages/cpp/clearAttribute.yml data/fixtures/recorded/languages/cpp/takeAttribute.yml renamed to data/fixtures/recorded/languages/cpp/clearAttribute.yml

@@ -1,9 +1,9 @@
 languageId: cpp
 command:
   version: 6
-  spokenForm: take attribute
+  spokenForm: change attribute
   action:
-    name: setSelection
+    name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
@@ -21,9 +21,9 @@ initialState:
   marks: {}
 finalState:
   documentContents: |
-    [[nodiscard]]
+    [[]]
     int f(int a = 1) {
     }
   selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 13}
+    - anchor: {line: 0, character: 2}
+      active: {line: 0, character: 2}

data/fixtures/recorded/languages/php/changeFunk3.yml

@@ -22,10 +22,9 @@ initialState:
       active: {line: 3, character: 0}
   marks: {}
 finalState:
-  documentContents: |-
+  documentContents: |+
     <?php
 
-    ;
   selections:
     - anchor: {line: 2, character: 0}
       active: {line: 2, character: 0}

data/fixtures/recorded/languages/php/changeFunk4.yml

@@ -20,10 +20,10 @@ initialState:
       active: {line: 2, character: 24}
   marks: {}
 finalState:
-  documentContents: |
+  documentContents: |+
     <?php
 
-    ;
+
   selections:
     - anchor: {line: 2, character: 0}
       active: {line: 2, character: 0}

data/fixtures/recorded/languages/php/chuckFunk.yml

@@ -22,9 +22,7 @@ initialState:
       active: {line: 3, character: 0}
   marks: {}
 finalState:
-  documentContents: |+
-    <?php
-
+  documentContents: <?php
   selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
+    - anchor: {line: 0, character: 5}
+      active: {line: 0, character: 5}

data/fixtures/recorded/languages/php/chuckFunk2.yml

@@ -20,10 +20,8 @@ initialState:
       active: {line: 2, character: 24}
   marks: {}
 finalState:
-  documentContents: |+
+  documentContents: |
     <?php
-
-
   selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
+    - anchor: {line: 1, character: 0}
+      active: {line: 1, character: 0}

data/fixtures/scopes/c/argumentList/argumentList.actual.method.singleLine.scope

@@ -1,13 +1,13 @@
-foo.bar(int aaa, int bbb);
+foo.bar(aaa, bbb);
 ---
 
 [Content] =
-[Removal] = 0:8-0:24
-          >----------------<
-0| foo.bar(int aaa, int bbb);
+[Removal] = 0:8-0:16
+          >--------<
+0| foo.bar(aaa, bbb);
 
-[Domain] = 0:0-0:25
-  >-------------------------<
-0| foo.bar(int aaa, int bbb);
+[Domain] = 0:0-0:17
+  >-----------------<
+0| foo.bar(aaa, bbb);
 
 [Insertion delimiter] = ", "

data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope

@@ -1,27 +1,10 @@
-switch (value) {
-    case 0:
-        break;
-    default:
-        break;
-}
+switch (foo) { }
 ---
 
-[Content] = 0:16-5:0
-                  >
-0| switch (value) {
-1|     case 0:
-2|         break;
-3|     default:
-4|         break;
-5| }
-   <
+[Content] = 0:14-0:15
+                >-<
+0| switch (foo) { }
 
-[Domain] = 0:0-5:1
-  >----------------
-0| switch (value) {
-1|     case 0:
-2|         break;
-3|     default:
-4|         break;
-5| }
-   -<
+[Domain] = 0:0-0:16
+  >----------------<
+0| switch (foo) { }

data/fixtures/scopes/c/branch/branch.switchCase.scope

@@ -1,8 +1,7 @@
-switch (value) {
+switch (foo) {
     case 0:
         break;
-    default:
-        break;
+    default: {}
 }
 ---
 
@@ -17,7 +16,7 @@ switch (value) {
   >-----------
 1|     case 0:
 2|         break;
-3|     default:
+3|     default: {}
    <
 
 [#1 Leading delimiter] = 1:0-1:4
@@ -28,21 +27,18 @@ switch (value) {
 
 
 [#2 Content] =
-[#2 Domain] = 3:4-4:14
-      >--------
-3|     default:
-4|         break;
-   --------------<
-
-[#2 Removal] = 3:0-5:0
-  >------------
-3|     default:
-4|         break;
-5| }
+[#2 Domain] = 3:4-3:15
+      >-----------<
+3|     default: {}
+
+[#2 Removal] = 3:0-4:0
+  >---------------
+3|     default: {}
+4| }
    <
 
 [#2 Leading delimiter] = 3:0-3:4
   >----<
-3|     default:
+3|     default: {}
 
 [#2 Insertion delimiter] = "\n"

data/fixtures/scopes/c/class/class4.scope

@@ -1,10 +1,10 @@
-typedef struct { } Foo;
+typedef struct {} Foo;
 ---
 
 [Content] =
 [Removal] =
-[Domain] = 0:0-0:23
-  >-----------------------<
-0| typedef struct { } Foo;
+[Domain] = 0:0-0:22
+  >----------------------<
+0| typedef struct {} Foo;
 
 [Insertion delimiter] = "\n\n"

data/fixtures/scopes/c/class/class5.scope

@@ -1,10 +1,10 @@
-typedef union { } Foo;
+typedef union {} Foo;
 ---
 
 [Content] =
 [Removal] =
-[Domain] = 0:0-0:22
-  >----------------------<
-0| typedef union { } Foo;
+[Domain] = 0:0-0:21
+  >---------------------<
+0| typedef union {} Foo;
 
 [Insertion delimiter] = "\n\n"