Merge branch 'main' into treeSitterSearchRange

Author: AndreasArvidsson

cursorless-everywhere-talon/cursorless_everywhere_talon_browser.py

@@ -1,6 +1,11 @@
 from talon import Context, Module, actions
 
-from .cursorless_everywhere_types import EditorEdit, EditorState, SelectionOffsets
+from .cursorless_everywhere_types import (
+    EditorChange,
+    EditorEdit,
+    EditorState,
+    SelectionOffsets,
+)
 
 mod = Module()
 
@@ -43,8 +48,9 @@ def cursorless_everywhere_edit_text(
         edit: EditorEdit,  # pyright: ignore [reportGeneralTypeIssues]
     ):
         command = {
-            "id": "setText",
+            "id": "editText",
             "text": edit["text"],
+            "changes": get_serializable_editor_changes(edit["changes"]),
         }
         res = rpc_get(command)
         if use_fallback(res):
@@ -71,3 +77,17 @@ def get_serializable_selections(selections: list[SelectionOffsets]):
             }
         )
     return result
+
+
+def get_serializable_editor_changes(changes: list[EditorChange]):
+    result: list[EditorChange] = []
+    for i in range(changes.length):  # pyright: ignore [reportAttributeAccessIssue]
+        change = changes[i]
+        result.append(
+            {
+                "text": change["text"],
+                "rangeOffset": change["rangeOffset"],
+                "rangeLength": change["rangeLength"],
+            }
+        )
+    return result

packages/cursorless-engine/src/languages/TreeSitterQuery/treeSitterQueryCache.ts

@@ -2,8 +2,8 @@ import type { Position, TextDocument } from "@cursorless/common";
 import type { QueryMatch } from "./QueryCapture";
 
 export class Cache {
-  private documentUri: string = "";
   private documentVersion: number = -1;
+  private documentUri: string = "";
   private documentLanguageId: string = "";
   private startPosition: Position | undefined;
   private endPosition: Position | undefined;
@@ -24,11 +24,11 @@ export class Cache {
     endPosition: Position | undefined,
   ) {
     return (
-      this.documentUri === document.uri.toString() &&
       this.documentVersion === document.version &&
+      this.documentUri === document.uri.toString() &&
       this.documentLanguageId === document.languageId &&
-      this.startPosition === startPosition &&
-      this.endPosition === endPosition
+      positionsEqual(this.startPosition, startPosition) &&
+      positionsEqual(this.endPosition, endPosition)
     );
   }
 
@@ -38,8 +38,8 @@ export class Cache {
     endPosition: Position | undefined,
     matches: QueryMatch[],
   ) {
-    this.documentUri = document.uri.toString();
     this.documentVersion = document.version;
+    this.documentUri = document.uri.toString();
     this.documentLanguageId = document.languageId;
     this.startPosition = startPosition;
     this.endPosition = endPosition;
@@ -51,4 +51,11 @@ export class Cache {
   }
 }
 
+function positionsEqual(a: Position | undefined, b: Position | undefined) {
+  if (a == null || b == null) {
+    return a === b;
+  }
+  return a.isEqual(b);
+}
+
 export const treeSitterQueryCache = new Cache();

packages/cursorless-vscode-e2e/src/suite/scopeProvider/runBasicScopeInfoTest.ts

@@ -54,11 +54,14 @@ function helloWorld() {
 }
 `;
 
-function getExpectedScope(scopeSupport: ScopeSupport): ScopeSupportInfo {
+function getExpectedScope(
+  scopeSupport: ScopeSupport,
+  iterationScopeSupport?: ScopeSupport,
+): ScopeSupportInfo {
   return {
     humanReadableName: "named function",
     isLanguageSpecific: true,
-    iterationScopeSupport: scopeSupport,
+    iterationScopeSupport: iterationScopeSupport ?? scopeSupport,
     scopeType: {
       type: "namedFunction",
     },
@@ -71,5 +74,8 @@ function getExpectedScope(scopeSupport: ScopeSupport): ScopeSupportInfo {
 }
 
 const unsupported = getExpectedScope(ScopeSupport.unsupported);
-const supported = getExpectedScope(ScopeSupport.supportedButNotPresentInEditor);
+const supported = getExpectedScope(
+  ScopeSupport.supportedButNotPresentInEditor,
+  ScopeSupport.supportedAndPresentInEditor,
+);
 const present = getExpectedScope(ScopeSupport.supportedAndPresentInEditor);