Fix TS errors

Author: chenglou

client/src/extension.ts

@@ -1,13 +1,12 @@
-import * as path from 'path';
-import { workspace, ExtensionContext, tasks, Task, TaskScope, ShellExecution } from 'vscode';
+import * as path from "path";
+import { workspace, ExtensionContext } from "vscode";
 
 import {
 	LanguageClient,
 	LanguageClientOptions,
 	ServerOptions,
 	TransportKind,
-	DefinitionRequest
-} from 'vscode-languageclient';
+} from "vscode-languageclient/node";
 
 let client: LanguageClient;
 
@@ -62,11 +61,11 @@ let client: LanguageClient;
 export function activate(context: ExtensionContext) {
 	// The server is implemented in node
 	let serverModule = context.asAbsolutePath(
-		path.join('server', 'out', 'server.js')
+		path.join("server", "out", "server.js")
 	);
 	// The debug options for the server
 	// --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging
-	let debugOptions = { execArgv: ['--nolazy', '--inspect=6009'] };
+	let debugOptions = { execArgv: ["--nolazy", "--inspect=6009"] };
 
 	// If the extension is launched in debug mode then the debug server options are used
 	// Otherwise the run options are used
@@ -75,26 +74,24 @@ export function activate(context: ExtensionContext) {
 		debug: {
 			module: serverModule,
 			transport: TransportKind.ipc,
-			options: debugOptions
-		}
+			options: debugOptions,
+		},
 	};
 
 	// Options to control the language client
 	let clientOptions: LanguageClientOptions = {
 		// Register the server for plain text documents
-		documentSelector: [
-			{ scheme: 'file', language: 'rescript' },
-		],
+		documentSelector: [{ scheme: "file", language: "rescript" }],
 		synchronize: {
 			// Notify the server about file changes to '.clientrc files contained in the workspace
-			fileEvents: workspace.createFileSystemWatcher('**/.clientrc')
-		}
+			fileEvents: workspace.createFileSystemWatcher("**/.clientrc"),
+		},
 	};
 
 	// Create the language client and start the client.
 	client = new LanguageClient(
-		'ReScriptLSP',
-		'ReScript Language Server',
+		"ReScriptLSP",
+		"ReScript Language Server",
 		serverOptions,
 		clientOptions
 	);

server/src/server.ts

@@ -1,6 +1,6 @@
 import process from "process";
 import * as p from "vscode-languageserver-protocol";
-import * as m from "vscode-jsonrpc/lib/messages";
+import * as m from "vscode-jsonrpc/lib/common/messages";
 import * as v from "vscode-languageserver";
 import * as rpc from "vscode-jsonrpc";
 import * as path from "path";
@@ -40,7 +40,7 @@ let projectsFiles: Map<
 // ^ caching AND states AND distributed system. Why does LSP has to be stupid like this
 
 // will be properly defined later depending on the mode (stdio/node-rpc)
-let send: (msg: m.Message) => void = (_) => {};
+let send: (msg: m.Message) => void = (_) => { };
 
 let sendUpdatedDiagnostics = () => {
   projectsFiles.forEach(({ filesWithDiagnostics }, projectRootPath) => {
@@ -343,15 +343,14 @@ function onMessage(msg: m.Message) {
         send(response);
       }
     } else if (msg.method === p.HoverRequest.method) {
-      let result: Hover | null = utils.runAnalysisAfterSanityCheck(
-        msg,
-        (filePath) => [
-          "hover",
-          filePath,
-          msg.params.position.line,
-          msg.params.position.character,
-        ]
-      );
+      let params = msg.params as p.HoverParams;
+      let filePath = fileURLToPath(params.textDocument.uri);
+      let result: Hover | null = utils.runAnalysisAfterSanityCheck(filePath, [
+        "hover",
+        filePath,
+        params.position.line,
+        params.position.character,
+      ]);
       let hoverResponse: m.ResponseMessage = {
         jsonrpc: c.jsonrpcVersion,
         id: msg.id,
@@ -362,15 +361,16 @@ function onMessage(msg: m.Message) {
       send(hoverResponse);
     } else if (msg.method === p.DefinitionRequest.method) {
       // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_definition
-      let result: Location[] | null = utils.runAnalysisAfterSanityCheck(
-        msg,
-        (filePath) => [
+      let params = msg.params as p.DefinitionParams;
+      let filePath = fileURLToPath(params.textDocument.uri);
+      let result:
+        | Location[]
+        | null = utils.runAnalysisAfterSanityCheck(filePath, [
           "definition",
           filePath,
-          msg.params.position.line,
-          msg.params.position.character,
-        ]
-      );
+          params.position.line,
+          params.position.character,
+        ]);
       let definitionResponse: m.ResponseMessage = {
         jsonrpc: c.jsonrpcVersion,
         id: msg.id,
@@ -380,13 +380,15 @@ function onMessage(msg: m.Message) {
       send(definitionResponse);
     } else if (msg.method === p.ReferencesRequest.method) {
       // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_references
+      let params = msg.params as p.ReferenceParams;
+      let filePath = fileURLToPath(params.textDocument.uri);
       let result: Location | null = utils.runAnalysisAfterSanityCheck(
-        msg,
-        (filePath) => [
+        filePath,
+        [
           "references",
           filePath,
-          msg.params.position.line,
-          msg.params.position.character,
+          params.position.line,
+          params.position.character,
         ]
       );
       let definitionResponse: m.ResponseMessage = {
@@ -398,31 +400,35 @@ function onMessage(msg: m.Message) {
       send(definitionResponse);
     } else if (msg.method === p.DocumentSymbolRequest.method) {
       // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_documentSymbol
+      let params = msg.params as p.DocumentSymbolParams;
+      let filePath = fileURLToPath(params.textDocument.uri);
       let result:
         | SymbolInformation[]
-        | null = utils.runAnalysisAfterSanityCheck(msg, (filePath) => [
-        "documentSymbol",
-        filePath,
-      ]);
+        | null = utils.runAnalysisAfterSanityCheck(filePath, [
+          "documentSymbol",
+          filePath,
+        ]);
       let definitionResponse: m.ResponseMessage = {
         jsonrpc: c.jsonrpcVersion,
         id: msg.id,
         result,
       };
       send(definitionResponse);
     } else if (msg.method === p.CompletionRequest.method) {
-      let code = getOpenedFileContent(msg.params.textDocument.uri);
+      let params = msg.params as p.ReferenceParams;
+      let filePath = fileURLToPath(params.textDocument.uri);
+      let code = getOpenedFileContent(params.textDocument.uri);
       let tmpname = utils.createFileInTempDir();
       fs.writeFileSync(tmpname, code, { encoding: "utf-8" });
       let result:
         | CompletionItem[]
-        | null = utils.runAnalysisAfterSanityCheck(msg, (filePath) => [
-        "complete",
-        filePath,
-        msg.params.position.line,
-        msg.params.position.character,
-        tmpname,
-      ]);
+        | null = utils.runAnalysisAfterSanityCheck(filePath, [
+          "complete",
+          filePath,
+          params.position.line,
+          params.position.character,
+          tmpname,
+        ]);
       fs.unlink(tmpname, () => null);
       let completionResponse: m.ResponseMessage = {
         jsonrpc: c.jsonrpcVersion,

server/src/utils.ts

@@ -6,7 +6,7 @@ import * as t from "vscode-languageserver-types";
 import fs from "fs";
 import * as os from "os";
 import { fileURLToPath } from "url";
-import { RequestMessage } from "vscode-languageserver";
+import { RequestMessage } from "vscode-languageserver-protocol";
 
 let tempFilePrefix = "rescript_format_file_" + process.pid + "_";
 let tempFileId = 0;
@@ -105,8 +105,8 @@ export let formatUsingValidBscExePath = (
 };
 
 export let runAnalysisAfterSanityCheck = (
-  msg: RequestMessage,
-  getArgs: (filePath: string) => Array<string>
+  filePath: p.DocumentUri,
+  args: Array<any>
 ) => {
   let binaryPath;
   if (fs.existsSync(c.analysisDevPath)) {
@@ -117,12 +117,11 @@ export let runAnalysisAfterSanityCheck = (
     return null;
   }
 
-  let filePath = fileURLToPath(msg.params.textDocument.uri);
   let projectRootPath = findProjectRootOfFile(filePath);
   if (projectRootPath == null) {
     return null;
   }
-  let stdout = childProcess.execFileSync(binaryPath, getArgs(filePath), {
+  let stdout = childProcess.execFileSync(binaryPath, args, {
     cwd: projectRootPath,
   });
   return JSON.parse(stdout.toString());