Refactoring

Author: AndreasArvidsson

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

@@ -1,13 +1,12 @@
 import type { Range } from "@cursorless/common";
-import { RangeTreeNode } from "./RangeTreeNode";
 import { RangeLookupList } from "./RangeLookupList";
 
 /**
  * A tree of ranges that allows for efficient lookup of ranges that contain a search item.
  * The items must be sorted in document order.
  */
 export class RangeLookupTree<T extends { range: Range }> {
-  private children: RangeLookupList<RangeTreeNode<T>>;
+  private children: RangeLookupList<RangeLookupTreeNode<T>>;
 
   /**
    * @param items The items to search in. Must be sorted in document order.
@@ -25,12 +24,12 @@ export class RangeLookupTree<T extends { range: Range }> {
 
 function createNodes<T extends { range: Range }>(
   items: T[],
-): RangeLookupList<RangeTreeNode<T>> {
-  const results: RangeTreeNode<T>[] = [];
-  const parents: RangeTreeNode<T>[] = [];
+): RangeLookupList<RangeLookupTreeNode<T>> {
+  const results: RangeLookupTreeNode<T>[] = [];
+  const parents: RangeLookupTreeNode<T>[] = [];
 
   for (const item of items) {
-    const node = new RangeTreeNode(item);
+    const node = new RangeLookupTreeNode(item);
 
     while (
       parents.length > 0 &&
@@ -52,3 +51,27 @@ function createNodes<T extends { range: Range }>(
 
   return new RangeLookupList(results);
 }
+
+class RangeLookupTreeNode<T extends { range: Range }> {
+  private children: RangeLookupList<RangeLookupTreeNode<T>>;
+
+  constructor(private item: T) {
+    this.children = new RangeLookupList([]);
+  }
+
+  get range(): Range {
+    return this.item.range;
+  }
+
+  addChildNode(node: RangeLookupTreeNode<T>) {
+    this.children.add(node);
+  }
+
+  getSmallLestContaining(range: Range): T {
+    const child = this.children
+      .getContaining(range)
+      ?.getSmallLestContaining(range);
+
+    return child ?? this.item;
+  }
+}