Merge branch 'master' of https://github.com/rescript-lang/rescript-vscode

Author: cristianoc

server/src/server.ts

@@ -19,8 +19,9 @@ import * as chokidar from "chokidar";
 import { assert } from "console";
 import { fileURLToPath } from "url";
 import { ChildProcess } from "child_process";
-import {  WorkspaceEdit } from "vscode-languageserver";
+import { WorkspaceEdit } from "vscode-languageserver";
 import { TextEdit } from "vscode-languageserver-types";
+import { OnReadOpts } from "node:net";
 
 // https://microsoft.github.io/language-server-protocol/specification#initialize
 // According to the spec, there could be requests before the 'initialize' request. Link in comment tells how to handle them.
@@ -243,6 +244,111 @@ if (process.argv.includes("--stdio")) {
   send = (msg: m.Message) => process.send!(msg);
   process.on("message", onMessage);
 }
+
+function hover(msg: p.RequestMessage) {
+  let params = msg.params as p.HoverParams;
+  let filePath = fileURLToPath(params.textDocument.uri);
+  let response = utils.runAnalysisCommand(
+    filePath,
+    ["hover", filePath, params.position.line, params.position.character],
+    msg
+  );
+  return response;
+}
+
+function definition(msg: p.RequestMessage) {
+  // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_definition
+  let params = msg.params as p.DefinitionParams;
+  let filePath = fileURLToPath(params.textDocument.uri);
+  let response = utils.runAnalysisCommand(
+    filePath,
+    ["definition", filePath, params.position.line, params.position.character],
+    msg
+  );
+  return response;
+}
+
+function references(msg: p.RequestMessage) {
+  // 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: typeof p.ReferencesRequest.type = utils.getReferencesForPosition(
+    filePath,
+    params.position
+  );
+  let response: m.ResponseMessage = {
+    jsonrpc: c.jsonrpcVersion,
+    id: msg.id,
+    result,
+    // error: code and message set in case an exception happens during the definition request.
+  };
+  return response;
+}
+
+function rename(msg: p.RequestMessage) {
+  // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_rename
+  let params = msg.params as p.RenameParams;
+  let filePath = fileURLToPath(params.textDocument.uri);
+  let locations: p.Location[] | null = utils.getReferencesForPosition(
+    filePath,
+    params.position
+  );
+  let result: WorkspaceEdit | null;
+  if (locations === null) {
+    result = null;
+  } else {
+    let changes: { [uri: string]: TextEdit[] } = {};
+    locations.forEach(({ uri, range }) => {
+      let textEdit: TextEdit = { range, newText: params.newName };
+      if (uri in changes) {
+        changes[uri].push(textEdit);
+      } else {
+        changes[uri] = [textEdit];
+      }
+    });
+    result = { changes };
+  }
+  let response: m.ResponseMessage = {
+    jsonrpc: c.jsonrpcVersion,
+    id: msg.id,
+    result,
+  };
+  return response;
+}
+
+function documentSymbol(msg: p.RequestMessage) {
+  // 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 response = utils.runAnalysisCommand(
+    filePath,
+    ["documentSymbol", filePath],
+    msg
+  );
+  return response;
+}
+
+function completion(msg: p.RequestMessage) {
+  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 response = utils.runAnalysisCommand(
+    filePath,
+    [
+      "completion",
+      filePath,
+      params.position.line,
+      params.position.character,
+      tmpname,
+    ],
+    msg
+  );
+  fs.unlink(tmpname, () => null);
+  return response;
+}
+
 function onMessage(msg: m.Message) {
   if (m.isNotificationMessage(msg)) {
     // notification message, aka the client ends it and doesn't want a reply
@@ -353,118 +459,17 @@ function onMessage(msg: m.Message) {
         send(response);
       }
     } else if (msg.method === p.HoverRequest.method) {
-      let params = msg.params as p.HoverParams;
-      let filePath = fileURLToPath(params.textDocument.uri);
-      let result: typeof p.HoverRequest.type = utils.runAnalysisAfterSanityCheck(
-        filePath,
-        ["hover", filePath, params.position.line, params.position.character]
-      );
-      let hoverResponse: m.ResponseMessage = {
-        jsonrpc: c.jsonrpcVersion,
-        id: msg.id,
-        // type result = Hover | null
-        // type Hover = {contents: MarkedString | MarkedString[] | MarkupContent, range?: Range}
-        result,
-      };
-      send(hoverResponse);
+      send(hover(msg));
     } else if (msg.method === p.DefinitionRequest.method) {
-      // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_definition
-      let params = msg.params as p.DefinitionParams;
-      let filePath = fileURLToPath(params.textDocument.uri);
-      let result: typeof p.DefinitionRequest.type = utils.runAnalysisAfterSanityCheck(
-        filePath,
-        [
-          "definition",
-          filePath,
-          params.position.line,
-          params.position.character,
-        ]
-      );
-      let definitionResponse: m.ResponseMessage = {
-        jsonrpc: c.jsonrpcVersion,
-        id: msg.id,
-        result,
-        // error: code and message set in case an exception happens during the definition request.
-      };
-      send(definitionResponse);
-    } else if (msg.method === p.RenameRequest.method) {
-      // https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_rename
-      let params = msg.params as p.RenameParams;
-      let filePath = fileURLToPath(params.textDocument.uri);
-      let locations: p.Location[] | null = utils.getReferencesForPosition(filePath, params.position);
-      let result: WorkspaceEdit | null;
-      if (locations === null) {
-        result = null;
-      } else {
-        let changes: { [uri: string]: TextEdit[] } = {};
-        locations.forEach(({ uri, range }) => {
-          let textEdit: TextEdit = {range, newText: params.newName};
-          if (uri in changes) {
-            changes[uri].push(textEdit);
-          } else {
-            changes[uri] = [textEdit]
-          }
-        });
-
-        result = {changes};
-      }
-
-      let renameResponse: m.ResponseMessage = {
-        jsonrpc: c.jsonrpcVersion,
-        id: msg.id,
-        result,
-      };
-
-      send(renameResponse);
+      send(definition(msg));
     } 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: typeof p.ReferencesRequest.type = utils.getReferencesForPosition(filePath, params.position);
-      let definitionResponse: m.ResponseMessage = {
-        jsonrpc: c.jsonrpcVersion,
-        id: msg.id,
-        result,
-        // error: code and message set in case an exception happens during the definition request.
-      };
-      send(definitionResponse);
+      send(references(msg));
+    } else if (msg.method === p.RenameRequest.method) {
+      send(rename(msg));
     } 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: typeof p.DocumentSymbolRequest.type = utils.runAnalysisAfterSanityCheck(
-        filePath,
-        ["documentSymbol", filePath]
-      );
-      let definitionResponse: m.ResponseMessage = {
-        jsonrpc: c.jsonrpcVersion,
-        id: msg.id,
-        result,
-      };
-      send(definitionResponse);
+      send(documentSymbol(msg));
     } else if (msg.method === p.CompletionRequest.method) {
-      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: typeof p.CompletionRequest.type = utils.runAnalysisAfterSanityCheck(
-        filePath,
-        [
-          "completion",
-          filePath,
-          params.position.line,
-          params.position.character,
-          tmpname,
-        ]
-      );
-      fs.unlink(tmpname, () => null);
-      let completionResponse: m.ResponseMessage = {
-        jsonrpc: c.jsonrpcVersion,
-        id: msg.id,
-        result,
-      };
-      send(completionResponse);
+      send(completion(msg));
     } else if (msg.method === p.DocumentFormattingRequest.method) {
       // technically, a formatting failure should reply with the error. Sadly
       // the LSP alert box for these error replies sucks (e.g. doesn't actually

server/src/utils.ts

@@ -3,6 +3,10 @@ import * as childProcess from "child_process";
 import * as p from "vscode-languageserver-protocol";
 import * as path from "path";
 import * as t from "vscode-languageserver-types";
+import {
+  RequestMessage,
+  ResponseMessage,
+} from "vscode-languageserver-protocol";
 import fs from "fs";
 import * as os from "os";
 
@@ -82,13 +86,13 @@ export let findNodeBuildOfProjectRoot = (
 
 type execResult =
   | {
-    kind: "success";
-    result: string;
-  }
+      kind: "success";
+      result: string;
+    }
   | {
-    kind: "error";
-    error: string;
-  };
+      kind: "error";
+      error: string;
+    };
 export let formatUsingValidBscNativePath = (
   code: string,
   bscNativePath: p.DocumentUri,
@@ -144,12 +148,34 @@ export let runAnalysisAfterSanityCheck = (
   return JSON.parse(stdout.toString());
 };
 
-export let getReferencesForPosition = (filePath: p.DocumentUri, position: p.Position) =>
-  runAnalysisAfterSanityCheck(filePath, ['references', filePath, position.line, position.character]);
+export let runAnalysisCommand = (
+  filePath: p.DocumentUri,
+  args: Array<any>,
+  msg: RequestMessage
+) => {
+  let result = runAnalysisAfterSanityCheck(filePath, args);
+  let response: ResponseMessage = {
+    jsonrpc: c.jsonrpcVersion,
+    id: msg.id,
+    result,
+  };
+  return response;
+};
+
+export let getReferencesForPosition = (
+  filePath: p.DocumentUri,
+  position: p.Position
+) =>
+  runAnalysisAfterSanityCheck(filePath, [
+    "references",
+    filePath,
+    position.line,
+    position.character,
+  ]);
 
 export let replaceFileExtension = (filePath: string, ext: string): string => {
   let name = path.basename(filePath, path.extname(filePath));
-  return path.format({ dir: path.dirname(filePath), name, ext })
+  return path.format({ dir: path.dirname(filePath), name, ext });
 };
 
 export let createInterfaceFileUsingValidBscExePath = (
@@ -158,13 +184,14 @@ export let createInterfaceFileUsingValidBscExePath = (
   bscExePath: p.DocumentUri
 ): execResult => {
   try {
-    let resiString = childProcess.execFileSync(
-      bscExePath,
-      ["-color", "never", cmiPath]
-    );
+    let resiString = childProcess.execFileSync(bscExePath, [
+      "-color",
+      "never",
+      cmiPath,
+    ]);
 
-    let resiPath = replaceFileExtension(filePath, c.resiExt)
-    fs.writeFileSync(resiPath, resiString, { encoding: "utf-8"});
+    let resiPath = replaceFileExtension(filePath, c.resiExt);
+    fs.writeFileSync(resiPath, resiString, { encoding: "utf-8" });
 
     return {
       kind: "success",