Clean up

Author: AndreasArvidsson

data/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml

@@ -14,13 +14,13 @@ 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: |-
 
-    ""
+    "'' 'fsd'"
   selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
+    - anchor: {line: 1, character: 2}
+      active: {line: 1, character: 2}

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/TreeSitterScopeHandler/TreeSitterScopeHandler.ts

@@ -74,13 +74,6 @@ export class TreeSitterScopeHandler extends BaseTreeSitterScopeHandler {
       true,
     )?.with(contentRange.end);
 
-    const interiorRange = getRelatedRange(
-      match,
-      scopeTypeType,
-      "interior",
-      true,
-    );
-
     let removalRange = getRelatedRange(match, scopeTypeType, "removal", true);
 
     if (
@@ -109,7 +102,6 @@ export class TreeSitterScopeHandler extends BaseTreeSitterScopeHandler {
           contentRange,
           prefixRange,
           removalRange,
-          interiorRange,
           leadingDelimiterRange,
           trailingDelimiterRange,
           insertionDelimiter,

packages/cursorless-engine/src/processTargets/targets/ScopeTypeTarget.ts

@@ -7,7 +7,6 @@ import type { Target } from "../../typings/target.types";
 import { toGeneralizedRange } from "../../util/targetUtils";
 import type { CommonTargetParameters } from "./BaseTarget";
 import { BaseTarget } from "./BaseTarget";
-import { InteriorTarget } from "./InteriorTarget";
 import { PlainTarget } from "./PlainTarget";
 import { getDelimitedSequenceRemovalRange } from "./util/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior";
 import {
@@ -21,7 +20,6 @@ export interface ScopeTypeTargetParameters extends CommonTargetParameters {
   readonly insertionDelimiter?: string;
   readonly prefixRange?: Range;
   readonly removalRange?: Range;
-  readonly interiorRange?: Range;
   readonly leadingDelimiterRange?: Range;
   readonly trailingDelimiterRange?: Range;
 }
@@ -30,7 +28,6 @@ export class ScopeTypeTarget extends BaseTarget<ScopeTypeTargetParameters> {
   type = "ScopeTypeTarget";
   private scopeTypeType_: SimpleScopeTypeType;
   private removalRange_?: Range;
-  private interiorRange_?: Range;
   private leadingDelimiterRange_?: Range;
   private trailingDelimiterRange_?: Range;
   private hasDelimiterRange_: boolean;
@@ -41,7 +38,6 @@ export class ScopeTypeTarget extends BaseTarget<ScopeTypeTargetParameters> {
     super(parameters);
     this.scopeTypeType_ = parameters.scopeTypeType;
     this.removalRange_ = parameters.removalRange;
-    this.interiorRange_ = parameters.interiorRange;
     this.leadingDelimiterRange_ = parameters.leadingDelimiterRange;
     this.trailingDelimiterRange_ = parameters.trailingDelimiterRange;
     this.prefixRange = parameters.prefixRange;
@@ -100,19 +96,6 @@ export class ScopeTypeTarget extends BaseTarget<ScopeTypeTargetParameters> {
     return getSmartRemovalTarget(this).getRemovalHighlightRange();
   }
 
-  getInterior(): Target[] | undefined {
-    if (this.interiorRange_ == null) {
-      return undefined;
-    }
-    return [
-      new InteriorTarget({
-        editor: this.editor,
-        isReversed: this.isReversed,
-        fullInteriorRange: this.interiorRange_,
-      }),
-    ];
-  }
-
   maybeCreateRichRangeTarget(
     isReversed: boolean,
     endTarget: ScopeTypeTarget,