Merge

Author: AndreasArvidsson

packages/cursorless-engine/src/languages/LanguageDefinition.ts

@@ -107,7 +107,7 @@ export class LanguageDefinition {
   }
 
   clearCache(): void {
-    this.cache.clear();
+    this.cache = new LanguageDefinitionCache();
   }
 
   /**

packages/cursorless-engine/src/languages/LanguageDefinitionCache.ts

@@ -10,12 +10,6 @@ export class LanguageDefinitionCache {
   private documentVersion: number = -1;
   private captures: StringRecord<QueryCapture[]> = {};
 
-  clear() {
-    this.documentUri = "";
-    this.documentVersion = -1;
-    this.captures = {};
-  }
-
   isValid(document: TextDocument) {
     return (
       this.documentUri === document.uri.toString() &&

…ndingPairScopeHandler/RangeLookupList.ts …ingPairScopeHandler/OneWayRangeFinder.tspackages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/RangeLookupList.ts renamed to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/OneWayRangeFinder.ts packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/RangeLookupList.ts renamed to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/OneWayRangeFinder.ts

@@ -1,12 +1,12 @@
 import type { Range } from "@cursorless/common";
-import { RangeLookupList } from "./RangeLookupList";
+import { OneWayRangeFinder } from "./OneWayRangeFinder";
 
 /**
  * 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<RangeLookupTreeNode<T>>;
+  private children: OneWayRangeFinder<RangeLookupTreeNode<T>>;
 
   /**
    * @param items The items to search in. Must be sorted in document order.
@@ -24,7 +24,7 @@ export class RangeLookupTree<T extends { range: Range }> {
 
 function createNodes<T extends { range: Range }>(
   items: T[],
-): RangeLookupList<RangeLookupTreeNode<T>> {
+): OneWayRangeFinder<RangeLookupTreeNode<T>> {
   const results: RangeLookupTreeNode<T>[] = [];
   const parents: RangeLookupTreeNode<T>[] = [];
 
@@ -49,14 +49,14 @@ function createNodes<T extends { range: Range }>(
     parents.push(node);
   }
 
-  return new RangeLookupList(results);
+  return new OneWayRangeFinder(results);
 }
 
 class RangeLookupTreeNode<T extends { range: Range }> {
-  public children: RangeLookupList<RangeLookupTreeNode<T>>;
+  public children: OneWayRangeFinder<RangeLookupTreeNode<T>>;
 
   constructor(private item: T) {
-    this.children = new RangeLookupList([]);
+    this.children = new OneWayRangeFinder([]);
   }
 
   get range(): Range {

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

@@ -7,7 +7,7 @@ import {
 import type { LanguageDefinition } from "../../../../languages/LanguageDefinition";
 import type { QueryCapture } from "../../../../languages/TreeSitterQuery/QueryCapture";
 import { getDelimiterRegex } from "./getDelimiterRegex";
-import { RangeLookupList } from "./RangeLookupList";
+import { OneWayRangeFinder } from "./OneWayRangeFinder";
 import { RangeLookupTree } from "./RangeLookupTree";
 import type { DelimiterOccurrence, IndividualDelimiter } from "./types";
 
@@ -28,7 +28,7 @@ export function getDelimiterOccurrences(
     return [];
   }
 
-  const disqualifyDelimiters = new RangeLookupList(
+  const disqualifyDelimiters = new OneWayRangeFinder(
     getSortedCaptures(languageDefinition, document, "disqualifyDelimiter"),
   );
   // We need a tree for text fragments since they can be nested