Change interior domain (#3099)

* Interior domain is now same as content range (before shrinking to text
content). `"take inside"` with the cursor on a function name will not
select function body anymore.
* Interior of typed target now utilities every scope. `"take inside
funk"` will select function body. `"take inside state"` will select all
branch bodies in an if statement.

Author: AndreasArvidsson

data/fixtures/recorded/languages/lua/changeInsideList.yml

@@ -14,8 +14,8 @@ initialState:
     def testing():
         pass
   selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
   marks: {}
 finalState:
   documentContents: |-

data/fixtures/recorded/modifiers/changeInsideValue.yml

@@ -0,0 +1,44 @@
+languageId: javascript
+command:
+  version: 7
+  spokenForm: change inside state
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - {type: interiorOnly}
+        - type: containingScope
+          scopeType: {type: statement}
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if (true) {
+        a;
+    }
+    else if (false) {
+        b;
+    } else {
+        c;
+    }
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+        
+    }
+    else if (false) {
+        
+    } else {
+        
+    }
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
+    - anchor: {line: 4, character: 4}
+      active: {line: 4, character: 4}
+    - anchor: {line: 6, character: 4}
+      active: {line: 6, character: 4}

data/fixtures/recorded/modifiers/changeInside.yml renamed to data/fixtures/recorded/modifiers/interior/changeInside5.yml

@@ -1,7 +1,7 @@
 languageId: plaintext
 command:
   version: 6
-  spokenForm: change every paint inside paren
+  spokenForm: change every paint inside
   action:
     name: clearAndSetSelection
     target:
@@ -10,17 +10,12 @@ command:
         - type: everyScope
           scopeType: {type: nonWhitespaceSequence}
         - {type: interiorOnly}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
   usePrePhraseSnapshot: true
 initialState:
   documentContents: foo(aa|aa-().c_d bb|bb-().'') { return 1; }
   selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.(:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
 finalState:
   documentContents: "  { return 1; }"
   selections:

data/fixtures/recorded/modifiers/interior/changeInsideState.yml

@@ -1,7 +1,7 @@
 languageId: plaintext
 command:
   version: 6
-  spokenForm: change every short paint inside paren
+  spokenForm: change every short paint inside
   action:
     name: clearAndSetSelection
     target:
@@ -10,17 +10,12 @@ command:
         - type: everyScope
           scopeType: {type: boundedNonWhitespaceSequence}
         - {type: interiorOnly}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
   usePrePhraseSnapshot: true
 initialState:
   documentContents: foo(aa|aa-().c_d bb|bb-().'')
   selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.(:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
 finalState:
   documentContents: foo( )
   selections:

data/fixtures/recorded/selectionTypes/changeEveryPaintInsideParen2.yml renamed to data/fixtures/recorded/selectionTypes/changeEveryPaintInside.yml

@@ -12,8 +12,8 @@ command:
 initialState:
   documentContents: (    )
   selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
   marks: {}
 finalState:
   documentContents: ()

data/fixtures/recorded/selectionTypes/changeEveryShortPaintInsideParen.yml renamed to data/fixtures/recorded/selectionTypes/changeEveryShortPaintInside.yml

@@ -12,8 +12,8 @@ command:
 initialState:
   documentContents: ()
   selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
   marks: {}
 finalState:
   documentContents: ()

data/fixtures/recorded/selectionTypes/clearCore.yml

@@ -14,8 +14,8 @@ initialState:
 
     "'jlkjl' 'fsd'"
   selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
+    - anchor: {line: 1, character: 7}
+      active: {line: 1, character: 7}
   marks: {}
 finalState:
   documentContents: |-

data/fixtures/recorded/selectionTypes/clearCore2.yml

@@ -1,25 +1,10 @@
 struct Foo { };
 ---
 
-[#1 Content] =
-[#1 Removal] = 0:12-0:13
+[Content] =
+[Removal] =
+[Domain] = 0:12-0:13
               >-<
 0| struct Foo { };
 
-[#1 Domain] = 0:0-0:15
-  >---------------<
-0| struct Foo { };
-
-[#1 Insertion delimiter] = " "
-
-
-[#2 Content] =
-[#2 Removal] = 0:12-0:13
-              >-<
-0| struct Foo { };
-
-[#2 Domain] = 0:11-0:14
-             >---<
-0| struct Foo { };
-
-[#2 Insertion delimiter] = " "
+[Insertion delimiter] = " "