Merge pull request #212 from elm-tooling/new-language-server-version

New language server version

Author: razzeee

package-lock.json

@@ -22,7 +22,8 @@
     "pjson": "1.0.9",
     "request": "^2.88.0",
     "rxjs": "^6.5.4",
-    "vscode-languageserver": "^5.2.1",
+    "vscode-languageserver": "^6.1.0",
+    "vscode-languageserver-textdocument": "^1.0.0",
     "vscode-uri": "^2.1.1",
     "web-tree-sitter": "^0.16.0",
     "ws": "^7.2.1"

package.json

@@ -18,10 +18,6 @@ export class CapabilityCalculator {
     this.clientCapabilities;
 
     return {
-      // Perform incremental syncs
-      // Incremental sync is disabled for now due to not being able to get the
-      // old text in ASTProvider
-      // textDocumentSync: TextDocumentSyncKind.Incremental,
       codeActionProvider: true,
       codeLensProvider: {
         resolveProvider: true,

src/capabilityCalculator.ts

@@ -3,13 +3,14 @@ import globby from "globby";
 import os from "os";
 import path from "path";
 import util from "util";
-import { IConnection } from "vscode-languageserver";
+import { IConnection, ProgressType } from "vscode-languageserver";
 import { URI } from "vscode-uri";
 import Parser, { Tree } from "web-tree-sitter";
 import { Forest } from "./forest";
 import { Imports } from "./imports";
 import * as utils from "./util/elmUtils";
 import { Settings } from "./util/settings";
+import { WorkDoneProgress } from "vscode-languageserver/lib/progress";
 
 const readFile = util.promisify(fs.readFile);
 const readdir = util.promisify(fs.readdir);
@@ -42,8 +43,8 @@ export class ElmWorkspace {
     this.imports = new Imports(parser);
   }
 
-  public async init() {
-    await this.initWorkspace();
+  public async init(progress: WorkDoneProgress) {
+    await this.initWorkspace(progress);
   }
 
   public hasDocument(uri: URI): boolean {
@@ -68,7 +69,9 @@ export class ElmWorkspace {
     return this.rootPath;
   }
 
-  private async initWorkspace() {
+  private async initWorkspace(x: WorkDoneProgress) {
+    let progress = 0;
+    x.begin("Indexing", progress);
     let elmVersion;
     try {
       elmVersion = await utils.getElmVersion(
@@ -183,18 +186,24 @@ export class ElmWorkspace {
       }
 
       const promiseList: Promise<void>[] = [];
+      const progressSteps = (elmFilePaths.length * 2) / 100;
       for (const filePath of elmFilePaths) {
+        progress += progressSteps;
+        x.report(progressSteps);
         promiseList.push(this.readAndAddToForest(filePath));
       }
       await Promise.all(promiseList);
 
       this.forest.treeIndex.forEach(item => {
+        progress += progressSteps;
+        x.report(progressSteps);
         this.connection.console.info(
           `Adding imports ${URI.parse(item.uri).fsPath}`,
         );
         this.imports.updateImports(item.uri, item.tree, this.forest);
       });
 
+      x.done();
       this.connection.console.info("Done parsing all files.");
     } catch (error) {
       this.connection.console.error(error.stack);

src/elmWorkspace.ts

@@ -28,7 +28,11 @@ const connection: IConnection = createConnection(ProposedFeatures.all);
 let server: ILanguageServer;
 
 connection.onInitialize(
-  async (params: InitializeParams): Promise<InitializeResult> => {
+  async (
+    params: InitializeParams,
+    cancel,
+    progress,
+  ): Promise<InitializeResult> => {
     await Parser.init();
     const absolute = Path.join(__dirname, "tree-sitter-elm.wasm");
     const pathToWasm = Path.relative(process.cwd(), absolute);
@@ -40,7 +44,7 @@ connection.onInitialize(
     parser.setLanguage(language);
 
     const { Server } = await import("./server");
-    server = new Server(connection, params, parser);
+    server = new Server(connection, params, parser, progress);
     await server.init();
 
     return server.capabilities;

src/index.ts

@@ -8,7 +8,6 @@ import {
 import { URI } from "vscode-uri";
 import Parser, { Point, SyntaxNode, Tree } from "web-tree-sitter";
 import { ElmWorkspace } from "../elmWorkspace";
-import { Position } from "../position";
 import { IDocumentEvents } from "../util/documentEvents";
 import { ElmWorkspaceMatcher } from "../util/elmWorkspaceMatcher";
 
@@ -50,58 +49,11 @@ export class ASTProvider {
     }
 
     for (const changeEvent of params.contentChanges) {
-      if (changeEvent.range && changeEvent.rangeLength) {
-        // range is range of the change. end is exclusive
-        // rangeLength is length of text removed
-        // text is new text
-        const { range, rangeLength, text } = changeEvent;
-        const startIndex: number = range.start.line * range.start.character;
-        const oldEndIndex: number = startIndex + rangeLength - 1;
-        if (tree) {
-          tree.edit({
-            // end index for new version of text
-            newEndIndex: range.end.line * range.end.character - 1,
-            // position in new doc change ended
-            newEndPosition: Position.FROM_VS_POSITION(range.end).toTSPosition(),
-
-            // end index for old version of text
-            oldEndIndex,
-            // position in old doc change ended.
-            oldEndPosition: this.computeEndPosition(
-              startIndex,
-              oldEndIndex,
-              tree,
-            ),
-
-            // index in old doc the change started
-            startIndex,
-            // position in old doc change started
-            startPosition: Position.FROM_VS_POSITION(
-              range.start,
-            ).toTSPosition(),
-          });
-          tree = this.parser.parse(text, tree);
-        }
-      } else {
-        tree = this.parser.parse(changeEvent.text);
-      }
+      tree = this.parser.parse(changeEvent.text);
     }
     if (tree) {
       forest.setTree(document.uri, true, true, tree);
       imports.updateImports(document.uri, tree, forest);
     }
   };
-
-  private computeEndPosition = (
-    startIndex: number,
-    endIndex: number,
-    tree: Tree,
-  ): Point => {
-    const node: SyntaxNode = tree.rootNode.descendantForIndex(
-      startIndex,
-      endIndex,
-    );
-
-    return node.endPosition;
-  };
 }

src/providers/astProvider.ts

@@ -1,4 +1,9 @@
-import { Diagnostic, IConnection, TextDocument } from "vscode-languageserver";
+import {
+  Diagnostic,
+  IConnection,
+  TextDocument,
+  FileChangeType,
+} from "vscode-languageserver";
 import { URI } from "vscode-uri";
 import { ElmWorkspace } from "../../elmWorkspace";
 import { ElmWorkspaceMatcher } from "../../util/elmWorkspaceMatcher";
@@ -62,6 +67,20 @@ export class DiagnosticsProvider {
       this.events.on("save", d =>
         this.getDiagnostics(d, true, elmAnalyseTrigger),
       );
+
+      this.connection.onDidChangeWatchedFiles(event => {
+        const newDeleteEvents = event.changes
+          .filter(a => a.type === FileChangeType.Deleted)
+          .map(a => a.uri);
+
+        newDeleteEvents.forEach(uri => {
+          this.currentDiagnostics.elmAnalyse.delete(uri);
+          this.currentDiagnostics.elmMake.delete(uri);
+          this.currentDiagnostics.elmTest.delete(uri);
+        });
+        this.sendDiagnostics();
+      });
+
       if (this.elmAnalyseDiagnostics) {
         this.elmAnalyseDiagnostics.on(
           "new-diagnostics",

src/providers/diagnostics/diagnosticsProvider.ts

@@ -29,6 +29,7 @@ import {
 import { DocumentEvents } from "./util/documentEvents";
 import { Settings } from "./util/settings";
 import { TextDocumentEvents } from "./util/textDocumentEvents";
+import { WorkDoneProgress } from "vscode-languageserver/lib/progress";
 
 export interface ILanguageServer {
   readonly capabilities: InitializeResult;
@@ -45,9 +46,9 @@ export class Server implements ILanguageServer {
     private connection: Connection,
     private params: InitializeParams,
     private parser: Parser,
+    private progress: WorkDoneProgress,
   ) {
     this.calculator = new CapabilityCalculator(params.capabilities);
-
     const initializationOptions = this.params.initializationOptions ?? {};
     this.settings = new Settings(
       this.connection,
@@ -108,7 +109,7 @@ export class Server implements ILanguageServer {
   }
 
   public async init() {
-    this.elmWorkspaces.forEach(async it => await it.init());
+    this.elmWorkspaces.forEach(async it => await it.init(this.progress));
   }
 
   public async registerInitializedProviders() {

src/server.ts

@@ -4,9 +4,11 @@ import {
   DidCloseTextDocumentParams,
   DidOpenTextDocumentParams,
   DidSaveTextDocumentParams,
-  TextDocument,
-  TextDocumentContentChangeEvent,
 } from "vscode-languageserver";
+import {
+  TextDocumentContentChangeEvent,
+  TextDocument,
+} from "vscode-languageserver-textdocument";
 import { IDocumentEvents } from "./documentEvents";
 
 type DidChangeCallback = (document: TextDocument) => void;