Use new createQuery Api

Author: AndreasArvidsson

packages/common/src/types/TreeSitter.ts

@@ -1,5 +1,5 @@
 import type { Range, TextDocument } from "@cursorless/common";
-import type { Language, Node, Tree } from "web-tree-sitter";
+import type { Node, Query, Tree } from "web-tree-sitter";
 
 export interface TreeSitter {
   /**
@@ -12,19 +12,20 @@ export interface TreeSitter {
    */
   getTree(document: TextDocument): Tree;
 
-  /**
-   * Gets a language if it is loaded
-   *
-   * @param languageId The language id of the language to get
-   * @returns The language if it is already loaded
-   */
-  getLanguage(languageId: string): Language | undefined;
-
   /**
    * Loads a language, returning true if it was successfully loaded
    *
    * @param languageId The language id of the language to load
    * @returns `true` if the language was successfully loaded
    */
   loadLanguage(languageId: string): Promise<boolean>;
+
+  /**
+   * Create a query if the language is loaded.
+   *
+   * @param languageId The language id of the language to get
+   * @param source The query source
+   * @returns The query if that language is already loaded
+   */
+  createQuery(languageId: string, source: string): Query | undefined;
 }

packages/cursorless-engine/src/disabledComponents/DisabledTreeSitter.ts

@@ -1,5 +1,5 @@
 import type { Range, TextDocument, TreeSitter } from "@cursorless/common";
-import type { Language, Node, Tree } from "web-tree-sitter";
+import type { Node, Query, Tree } from "web-tree-sitter";
 
 export class DisabledTreeSitter implements TreeSitter {
   getTree(_document: TextDocument): Tree {
@@ -10,11 +10,11 @@ export class DisabledTreeSitter implements TreeSitter {
     return Promise.resolve(false);
   }
 
-  getLanguage(_languageId: string): Language | undefined {
+  getNodeAtLocation(_document: TextDocument, _range: Range): Node {
     throw new Error("Tree sitter not provided");
   }
 
-  getNodeAtLocation(_document: TextDocument, _range: Range): Node {
+  createQuery(_languageId: string, _source: string): Query | undefined {
     throw new Error("Tree sitter not provided");
   }
 }

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

@@ -60,14 +60,14 @@ export class LanguageDefinition {
       return undefined;
     }
 
-    const language = treeSitter.getLanguage(languageId);
+    const rawQuery = treeSitter.createQuery(languageId, rawLanguageQueryString);
 
-    if (language == null) {
-      throw Error(`Could not get Tree sitter language for ${languageId}`);
+    if (rawQuery == null) {
+      throw Error(
+        `Could not create Tree sitter query for language ${languageId}`,
+      );
     }
 
-    const rawQuery = new Query(language, rawLanguageQueryString);
-
     const query = TreeSitterQuery.create(languageId, treeSitter, rawQuery);
 
     return new LanguageDefinition(query);

packages/cursorless-vscode/src/extension.ts

@@ -265,7 +265,7 @@ function createTreeSitter(parseTreeApi: ParseTreeApi): TreeSitter {
     },
 
     loadLanguage: parseTreeApi.loadLanguage,
-    getLanguage: parseTreeApi.getLanguage,
+    createQuery: parseTreeApi.createQuery,
   };
 }
 

packages/vscode-common/src/getExtensionApi.ts

@@ -1,6 +1,6 @@
 import type { CommandServerApi } from "@cursorless/common";
 import * as vscode from "vscode";
-import type { Language, Node, Tree } from "web-tree-sitter";
+import type { Node, Query, Tree } from "web-tree-sitter";
 import type { VscodeTestHelpers } from "./TestHelpers";
 
 export interface CursorlessApi {
@@ -11,7 +11,7 @@ export interface ParseTreeApi {
   getNodeAtLocation(location: vscode.Location): Node;
   getTreeForUri(uri: vscode.Uri): Tree;
   loadLanguage: (languageId: string) => Promise<boolean>;
-  getLanguage(languageId: string): Language | undefined;
+  createQuery(languageId: string, source: string): Query | undefined;
 }
 
 export async function getExtensionApi<T>(extensionId: string) {