Added tree

Author: AndreasArvidsson

data/fixtures/recorded/surroundingPair/textual/changePair3.yml

@@ -0,0 +1,23 @@
+languageId: typescript
+command:
+  version: 7
+  spokenForm: change pair
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: surroundingPair, delimiter: any}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "`[1, ${\"]\"}, 3]`"
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: "``"
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}

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

@@ -0,0 +1,21 @@
+import type { Range } from "@cursorless/common";
+
+export class RangeNode<T extends { range: Range }> {
+  children: RangeNode<T>[] = [];
+
+  constructor(private item: T) {}
+
+  get range(): Range {
+    return this.item.range;
+  }
+
+  getSmallLestContaining(separator: Range): T {
+    for (const child of this.children) {
+      if (child.item.range.contains(separator)) {
+        return child.getSmallLestContaining(separator);
+      }
+    }
+
+    return this.item;
+  }
+}

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/createRangeTree.ts

@@ -0,0 +1,37 @@
+import type { Range } from "@cursorless/common";
+import { RangeNode } from "./RangeNode";
+
+/**
+ * Creates a tree of ranges from a list of ranges. This improves containing lookup time.
+ * @param items The ranges to create a tree from.
+ * @returns The root nodes of the tree.
+ */
+export function createRangeTree<T extends { range: Range }>(
+  items: T[],
+): RangeNode<T>[] {
+  const results: RangeNode<T>[] = [];
+  const parents: RangeNode<T>[] = [];
+
+  for (const item of items) {
+    const node = new RangeNode(item);
+
+    while (
+      parents.length > 0 &&
+      !parents[parents.length - 1].range.contains(item.range)
+    ) {
+      parents.pop();
+    }
+
+    const parent = parents[parents.length - 1];
+
+    if (parent != null) {
+      parent.children.push(node);
+    } else {
+      results.push(node);
+    }
+
+    parents.push(node);
+  }
+
+  return results;
+}

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getDelimiterOccurrences.ts

@@ -1,6 +1,7 @@
 import { matchAllIterator, Range, type TextDocument } from "@cursorless/common";
 import type { LanguageDefinition } from "../../../../languages/LanguageDefinition";
 import type { QueryCapture } from "../../../../languages/TreeSitterQuery/QueryCapture";
+import { createRangeTree } from "./createRangeTree";
 import { getDelimiterRegex } from "./getDelimiterRegex";
 import { RangeIterator } from "./RangeIterator";
 import type { DelimiterOccurrence, IndividualDelimiter } from "./types";
@@ -22,11 +23,17 @@ export function getDelimiterOccurrences(
     return [];
   }
 
-  const disqualifyDelimiters = createRangeIterator(
-    languageDefinition?.getCaptures(document, "disqualifyDelimiter"),
+  const disqualifyDelimiters = new RangeIterator(
+    getSortedCaptures(
+      languageDefinition?.getCaptures(document, "disqualifyDelimiter"),
+    ),
   );
-  const textFragments = createRangeIterator(
-    languageDefinition?.getCaptures(document, "textFragment"),
+  const textFragments = new RangeIterator(
+    createRangeTree(
+      getSortedCaptures(
+        languageDefinition?.getCaptures(document, "textFragment"),
+      ),
+    ),
   );
 
   const delimiterTextToDelimiterInfoMap = Object.fromEntries(
@@ -54,9 +61,12 @@ export function getDelimiterOccurrences(
     const isDisqualified = delimiter != null && !delimiter.hasError();
 
     if (!isDisqualified) {
+      const textFragmentRange = textFragments
+        .getContaining(range)
+        ?.getSmallLestContaining(range).range;
       results.push({
         delimiterInfo: delimiterTextToDelimiterInfoMap[text],
-        textFragmentRange: textFragments.getContaining(range)?.range,
+        textFragmentRange,
         range,
       });
     }
@@ -65,10 +75,10 @@ export function getDelimiterOccurrences(
   return results;
 }
 
-function createRangeIterator(
+function getSortedCaptures(
   captures: QueryCapture[] | undefined,
-): RangeIterator<QueryCapture> {
+): QueryCapture[] {
   const items = captures ?? [];
   items.sort((a, b) => a.range.start.compareTo(b.range.start));
-  return new RangeIterator(items);
+  return items;
 }