Merge with main

Author: AndreasArvidsson

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/CollectionItemTextualScopeHandler.ts

@@ -14,12 +14,12 @@ import type {
   ScopeIteratorRequirements,
 } from "../scopeHandler.types";
 import type { ScopeHandlerFactory } from "../ScopeHandlerFactory";
+import { OneWayNestedRangeFinder } from "../util/OneWayNestedRangeFinder";
+import { OneWayRangeFinder } from "../util/OneWayRangeFinder";
 import { collectionItemIterationScopeHandler } from "./collectionItemIterationScopeHandler";
-import { createRangeTree } from "./createRangeTree";
 import { createTargetScope } from "./createTargetScope";
 import { getInteriorRanges } from "./getInteriorRanges";
 import { getSeparatorOccurrences } from "./getSeparatorOccurrences";
-import { RangeIterator } from "./RangeIterator";
 
 export class CollectionItemTextualScopeHandler extends BaseScopeHandler {
   public scopeType: ScopeType = { type: "collectionItem" };
@@ -50,33 +50,30 @@ export class CollectionItemTextualScopeHandler extends BaseScopeHandler {
       editor,
       "collectionBoundary",
     );
-    const interiorRangeIterator = new RangeIterator(
-      createRangeTree(interiorRanges),
-    );
+    const interiorRangeFinder = new OneWayNestedRangeFinder(interiorRanges);
     const stringRanges = getInteriorRanges(
       this.scopeHandlerFactory,
       this.languageId,
       editor,
       "string",
     );
-    const stringRangeIterator = new RangeIterator(stringRanges);
+    const stringRangeFinder = new OneWayRangeFinder(stringRanges);
     const scopes: TargetScope[] = [];
     const usedInteriors = new Set<Range>();
     const iterationStatesStack: IterationState[] = [];
 
     for (const separator of separatorRanges) {
       // Separators in a string are not considered
-      if (stringRangeIterator.contains(separator)) {
+      if (stringRangeFinder.contains(separator)) {
         continue;
       }
 
       const currentIterationState =
         iterationStatesStack[iterationStatesStack.length - 1];
 
       // Get range for smallest containing interior
-      const containingInteriorRange = interiorRangeIterator
-        .getContaining(separator)
-        ?.getSmallLestContaining(separator);
+      const containingInteriorRange =
+        interiorRangeFinder.getSmallestContaining(separator)?.range;
 
       // The contain range is either the interior or the line containing the separator
       const containingIterationRange =
@@ -130,10 +127,12 @@ export class CollectionItemTextualScopeHandler extends BaseScopeHandler {
 
     // Add interior ranges without a delimiter in them. eg: `[foo]`
     for (const interior of interiorRanges) {
-      if (!usedInteriors.has(interior)) {
-        const range = shrinkRangeToFitContent(editor, interior);
+      if (!usedInteriors.has(interior.range)) {
+        const range = shrinkRangeToFitContent(editor, interior.range);
         if (!range.isEmpty) {
-          scopes.push(createTargetScope(isEveryScope, editor, interior, range));
+          scopes.push(
+            createTargetScope(isEveryScope, editor, interior.range, range),
+          );
         }
       }
     }

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/RangeIterator.ts

@@ -11,7 +11,7 @@ export function getInteriorRanges(
   languageId: string,
   editor: TextEditor,
   delimiter: SurroundingPairName,
-): Range[] {
+): { range: Range }[] {
   const scopeHandler = scopeHandlerFactory.create(
     {
       type: "surroundingPairInterior",
@@ -26,6 +26,6 @@ export function getInteriorRanges(
       skipAncestorScopes: false,
       includeDescendantScopes: true,
     }),
-    (scope) => scope.domain,
+    (scope) => ({ range: scope.domain }),
   );
 }

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/RangeNode.ts

@@ -6,9 +6,9 @@ import {
 } from "@cursorless/common";
 import type { LanguageDefinition } from "../../../../languages/LanguageDefinition";
 import type { QueryCapture } from "../../../../languages/TreeSitterQuery/QueryCapture";
+import { OneWayNestedRangeFinder } from "../util/OneWayNestedRangeFinder";
+import { OneWayRangeFinder } from "../util/OneWayRangeFinder";
 import { getDelimiterRegex } from "./getDelimiterRegex";
-import { OneWayRangeFinder } from "./OneWayRangeFinder";
-import { OneWayNestedRangeFinder } from "./OneWayNestedRangeFinder";
 import type { DelimiterOccurrence, IndividualDelimiter } from "./types";
 
 /**