Bump tree-sitter-cli from 0.20.8 to 0.25.3

package.json

@@ -29,10 +29,10 @@
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "1.0.11",
     "vscode-uri": "^3.0.8",
-    "web-tree-sitter": "^0.20.8"
+    "web-tree-sitter": "^0.25.3"
   },
   "devDependencies": {
-    "@elm-tooling/tree-sitter-elm": "^5.7.0",
+    "@elm-tooling/tree-sitter-elm": "^5.8.0",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.10.5",
     "@typescript-eslint/eslint-plugin": "^6.15.0",
@@ -47,7 +47,7 @@
     "jest-diff": "^29.7.0",
     "jest-mock-extended": "^3.0.5",
     "prettier": "^3.1.1",
-    "tree-sitter-cli": "^0.20.8",
+    "tree-sitter-cli": "^0.25.3",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.2",
     "typescript": "5.3.3"
@@ -62,7 +62,7 @@
     "watch": "npm run copy-wasm && tsc -watch -p ./",
     "lint": "eslint -c .eslintrc.js --ext .ts src",
     "lint:fix": "eslint --fix -c .eslintrc.js --ext .ts src",
-    "build-tree-sitter": "tree-sitter build-wasm ./node_modules/@elm-tooling/tree-sitter-elm",
+    "build-tree-sitter": "tree-sitter build --wasm ./node_modules/@elm-tooling/tree-sitter-elm",
     "test": "jest --coverage",
     "generate-toc": "doctoc README.md"
   },

src/common/index.ts

@@ -7,7 +7,7 @@ import {
   InitializeResult,
 } from "vscode-languageserver";
 
-import Parser from "web-tree-sitter";
+import { Parser, Language } from "web-tree-sitter";
 import { CapabilityCalculator } from "./capabilityCalculator";
 import { ASTProvider } from "./providers";
 import {
@@ -64,7 +64,7 @@ export function startCommonServer(
       connection.console.info(
         `Loading Elm tree-sitter syntax from ${pathToWasm}`,
       );
-      const language = await Parser.Language.load(pathToWasm);
+      const language = await Language.load(pathToWasm);
       const parser = container.resolve<Parser>("Parser");
       parser.setLanguage(language);
 

src/common/providers/astProvider.ts

@@ -8,7 +8,7 @@
   FileChangeType,
 } from "vscode-languageserver";
 import { URI } from "vscode-uri";
-import Parser, { Edit, Point, SyntaxNode } from "web-tree-sitter";
+import Parser, { Edit, Point, Node } from "web-tree-sitter";
 import { ElmWorkspaceMatcher } from "../util/elmWorkspaceMatcher";
 import {
   Position,
@@ -23,16 +23,16 @@
 
 export class ASTProvider {
   private connection: Connection;
   private parser: Parser;
   private documentEvents: TextDocumentEvents;
 
   private treeChangeEvent = new Emitter<{
     sourceFile: ISourceFile;
-    declaration?: SyntaxNode;
+    declaration?: Node;
   }>();
   readonly onTreeChange: Event<{
     sourceFile: ISourceFile;
-    declaration?: SyntaxNode;
+    declaration?: Node;
   }> = this.treeChangeEvent.event;
 
   private treeDeleteEvent = new Emitter<{ uri: string }>();
@@ -41,7 +41,7 @@
   private pendingRenames = new Map<string, string>();
 
   constructor() {
     this.parser = container.resolve("Parser");
     this.connection = container.resolve("Connection");
     this.documentEvents = container.resolve(TextDocumentEvents);
 
@@ -132,7 +132,7 @@
       hasContentChanges ? tree : undefined,
     );
 
-    let changedDeclaration: SyntaxNode | undefined;
+    let changedDeclaration: Node | undefined;
 
     tree
       ?.getChangedRanges(newTree)
@@ -167,7 +167,7 @@
     tree = newTree;
 
     const newIds = new Set(
       newTree.rootNode.namedChildren.map((n) => n.id).values(),
     );
 
     oldNodes.forEach((node) => {

src/common/providers/codeAction/addMissingRecordFieldCodeAction.ts

@@ -1,5 +1,5 @@
 import { Range, TextEdit } from "vscode-languageserver";
-import { SyntaxNode } from "web-tree-sitter";
+import { Node } from "web-tree-sitter";
 import { CodeActionProvider, ICodeAction } from "..";
 import { ISourceFile } from "../../../compiler/forest";
 import { getSpaces } from "../../util/refactorEditUtils";
@@ -97,7 +97,7 @@ function getEdits(
 
 function createFields(
   fields: [string, Type][],
-  targetRecord: SyntaxNode,
+  targetRecord: Node,
   checker: TypeChecker,
   sourceFile: ISourceFile,
 ): { [uri: string]: TextEdit[] } {

src/common/providers/codeAction/addNewFunctionParameter.ts

@@ -3,7 +3,7 @@ import { TreeUtils } from "../../util/treeUtils";
 import { Diagnostics } from "../../../compiler/diagnostics";
 import { CodeActionProvider, ICodeAction } from "../codeActionProvider";
 import { ICodeActionParams } from "../paramsExtensions";
-import { SyntaxNode } from "web-tree-sitter";
+import { Node } from "web-tree-sitter";
 
 const errorCodes = [Diagnostics.MissingValue.code];
 const fixId = "add_new_function_parameter";
@@ -40,8 +40,8 @@ function getActions(
 }
 
 function getActionsForValueDeclaration(
-  valueDeclaration: SyntaxNode,
-  nodeAtPosition: SyntaxNode,
+  valueDeclaration: Node,
+  nodeAtPosition: Node,
   params: ICodeActionParams,
 ): CodeAction | undefined {
   const lastFunctionParameter = valueDeclaration?.firstChild?.lastChild;
@@ -76,8 +76,8 @@ function getActionsForValueDeclaration(
 
 function getEditsForSignatureUpdate(
   params: ICodeActionParams,
-  nodeAtPosition: SyntaxNode,
-  valueDeclaration: SyntaxNode,
+  nodeAtPosition: Node,
+  valueDeclaration: Node,
 ): TextEdit[] {
   const typeAnnotation = TreeUtils.getTypeAnnotation(valueDeclaration);
   const lastParameterType =

src/common/providers/codeAction/extractFunctionCodeAction.ts

@@ -1,5 +1,5 @@
 import { CodeActionKind, Position, TextEdit } from "vscode-languageserver";
-import { SyntaxNode } from "web-tree-sitter";
+import { Node } from "web-tree-sitter";
 import { RefactorEditUtils } from "../../util/refactorEditUtils";
 import { TreeUtils } from "../../util/treeUtils";
 import { TFunction } from "../../../compiler/typeInference";
@@ -87,7 +87,7 @@ CodeActionProvider.registerRefactorAction(refactorName, {
       line: rootNode.endPosition.row,
       character: 0,
     };
-    let targetScope: SyntaxNode;
+    let targetScope: Node;
     let addTypeAnnotation = true;
 
     switch (actionName) {
@@ -128,14 +128,15 @@ CodeActionProvider.registerRefactorAction(refactorName, {
         break;
     }
 
-    const args: SyntaxNode[] = [];
+    const args: Node[] = [];
 
     const nodeParent = node.parent;
     const imports = checker.getAllImports(params.sourceFile);
 
     // Get the list of references that won't be visible
     node
       .descendantsOfType(["value_expr", "record_base_identifier"])
+      .filter((val) => val !== null)
       .forEach((val) => {
         if (args.find((arg) => arg.text === val.text)) {
           return;
@@ -152,7 +153,7 @@ CodeActionProvider.registerRefactorAction(refactorName, {
         }
 
         // If we find it in the scope we are extracting, it should not be a arg
-        let scope: SyntaxNode | null = val;
+        let scope: Node | null = val;
         while (scope && scope.id !== nodeParent?.id) {
           if (params.sourceFile.symbolLinks?.get(scope)?.get(val.text)) {
             return;

src/common/providers/codeAction/extractTypeAliasCodeAction.ts

@@ -1,5 +1,5 @@
 import { CodeActionKind, Position, TextEdit } from "vscode-languageserver";
-import { SyntaxNode } from "web-tree-sitter";
+import { Node } from "web-tree-sitter";
 import { RefactorEditUtils } from "../../util/refactorEditUtils";
 import { TreeUtils } from "../../util/treeUtils";
 import {
@@ -118,7 +118,7 @@ CodeActionProvider.registerRefactorAction(refactorName, {
   ): IRefactorEdit => {
     const edits: TextEdit[] = [];
 
-    const nodes: SyntaxNode[] = [];
+    const nodes: Node[] = [];
     if (action === "extract_type_alias_partial_type_expr") {
       const startNode = TreeUtils.getNamedDescendantForPosition(
         params.sourceFile.tree.rootNode,