Refactor

Author: AndreasArvidsson

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

@@ -58,20 +58,18 @@ export class CollectionItemTextualScopeHandler extends BaseScopeHandler {
     const usedInteriors = new Set<Range>();
     const iterationStatesStack: IterationState[] = [];
 
-    //   TODO: fixed performance on large files
     for (const separator of separatorRanges) {
       // Separators in a string are not considered
-      if (stringRanges.some((range) => range.contains(separator))) {
+      if (stringRanges.contains(separator)) {
         continue;
       }
 
       const currentIterationState =
         iterationStatesStack[iterationStatesStack.length - 1];
 
       // Get range for smallest containing interior
-      const containingInteriorRange: Range | undefined = interiorRanges
-        .filter((range) => range.contains(separator))
-        .sort((a, b) => (a.contains(b) ? 1 : b.contains(a) ? -1 : 0))[0];
+      const containingInteriorRange =
+        interiorRanges.getsSmallestContaining(separator);
 
       // The contain range is either the interior or the line containing the separator
       const containingIterationRange =
@@ -107,7 +105,9 @@ export class CollectionItemTextualScopeHandler extends BaseScopeHandler {
       }
 
       // New containing range. Add it to the list.
-      usedInteriors.add(containingInteriorRange);
+      if (containingInteriorRange != null) {
+        usedInteriors.add(containingInteriorRange);
+      }
 
       iterationStatesStack.push({
         editor,
@@ -122,7 +122,7 @@ export class CollectionItemTextualScopeHandler extends BaseScopeHandler {
     }
 
     // Add interior ranges without a delimiter in them. eg: `[foo]`
-    for (const interior of interiorRanges) {
+    for (const interior of interiorRanges.ranges) {
       if (!usedInteriors.has(interior)) {
         const range = shrinkRangeToFitContent(editor, interior);
         if (!range.isEmpty) {

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

@@ -0,0 +1,37 @@
+import type { Range } from "@cursorless/common";
+
+export class RangeIterator {
+  private index = 0;
+
+  constructor(public ranges: Range[]) {}
+
+  contains(separator: Range): boolean {
+    while (this.index < this.ranges.length) {
+      const range = this.ranges[this.index];
+
+      if (range.contains(separator)) {
+        return true;
+      }
+
+      // Separator is after the range. Since the ranges are sorted, we can stop here.
+      if (separator.start.isAfter(range.end)) {
+        return false;
+      }
+
+      this.index++;
+    }
+
+    return false;
+  }
+
+  getsSmallestContaining(separator: Range): Range | undefined {
+    //   TODO: fixed performance on large files
+    return this.ranges
+      .filter((range) => range.contains(separator))
+      .sort((a, b) => (a.contains(b) ? 1 : b.contains(a) ? -1 : 0))[0];
+  }
+}
+
+// const containingInteriorRange: Range | undefined = interiorRanges
+//         .filter((range) => range.contains(separator))
+//         .sort((a, b) => (a.contains(b) ? 1 : b.contains(a) ? -1 : 0))[0];

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

@@ -1,30 +1,33 @@
 import {
-  type Range,
   type SurroundingPairName,
   type TextEditor,
   Position,
 } from "@cursorless/common";
 import type { ScopeHandlerFactory } from "../ScopeHandlerFactory";
+import { RangeIterator } from "./RangeIterator";
 
 export function getInteriorRanges(
   scopeHandlerFactory: ScopeHandlerFactory,
   languageId: string,
   editor: TextEditor,
   delimiter: SurroundingPairName,
-): Range[] {
+): RangeIterator {
   const scopeHandler = scopeHandlerFactory.create(
     {
       type: "surroundingPairInterior",
       delimiter,
     },
     languageId,
   );
-  return Array.from(
+
+  const ranges = Array.from(
     scopeHandler.generateScopes(editor, new Position(0, 0), "forward", {
       containment: undefined,
       skipAncestorScopes: false,
       includeDescendantScopes: true,
     }),
     (scope) => scope.domain,
   );
+
+  return new RangeIterator(ranges);
 }