Clean up

Author: chenglou

server/src/RescriptEditorSupport.ts

@@ -1,91 +1,33 @@
 import { fileURLToPath } from "url";
 import { RequestMessage } from "vscode-languageserver";
-import { CompletionItem, Hover, Location } from "vscode-languageserver-protocol";
+import {
+  CompletionItem,
+  Hover,
+  Location,
+} from "vscode-languageserver-protocol";
 import * as utils from "./utils";
-import * as path from "path";
 import { execFileSync } from "child_process";
 import fs from "fs";
-
-let binariesFolder = path.join(
-  path.dirname(__dirname),
-  "analysis_binaries"
-)
-
-// For local development and CI tests
-let currentPlatformBinaryPath = path.join(
-  binariesFolder,
-  "current-platform.exe"
-);
-// Platform-specific production binaries manually downloaded from CI
-let productionBinaryPath = path.join(
-  binariesFolder,
-  process.platform + ".exe"
-);
+import {
+  analysisCurrentPlatformBinaryPath,
+  analysisProductionBinaryPath,
+} from "./constants";
 
 let findBinary = () => {
-  if (fs.existsSync(currentPlatformBinaryPath)) {
-    return currentPlatformBinaryPath
-  } else if (fs.existsSync(productionBinaryPath)) {
-    return productionBinaryPath
+  if (fs.existsSync(analysisCurrentPlatformBinaryPath)) {
+    return analysisCurrentPlatformBinaryPath;
+  } else if (fs.existsSync(analysisProductionBinaryPath)) {
+    return analysisProductionBinaryPath;
   } else {
-    return null
+    return null;
   }
-}
-
-// export let binaryExists = fs.existsSync(binaryPath);
-
-// let findExecutable = (uri: string) => {
-//   let filePath = fileURLToPath(uri);
-//   let projectRootPath = utils.findProjectRootOfFile(filePath);
-//   if (projectRootPath == null || !binaryExists) {
-//     return null;
-//   } else {
-//     return {
-//       binaryPath: binaryPath,
-//       filePath: filePath,
-//       cwd: projectRootPath,
-//     };
-//   }
-// };
-
-// type dumpCommandResult = {
-//   hover?: string;
-//   definition?: { uri?: string; range: any };
-// };
-// export function runDumpCommand(msg: RequestMessage): dumpCommandResult | null {
-//   let executable = findExecutable(msg.params.textDocument.uri);
-//   if (executable == null) {
-//     return null;
-//   }
-
-//   let command =
-//     executable.filePath +
-//     ":" +
-//     msg.params.position.line +
-//     ":" +
-//     msg.params.position.character;
-
-//   try {
-//     let stdout = execFileSync(executable.binaryPath, ["dump", command], {
-//       cwd: executable.cwd,
-//     });
-//     let parsed = JSON.parse(stdout.toString());
-//     if (parsed && parsed[0]) {
-//       return parsed[0];
-//     } else {
-//       return null;
-//     }
-//   } catch (error) {
-//     // TODO: @cristianoc any exception possible?
-//     return null;
-//   }
-// }
+};
 
 export function runCompletionCommand(
   msg: RequestMessage,
   code: string
 ): CompletionItem[] | null {
-  let filePath = fileURLToPath(msg.params.textDocument.uri)
+  let filePath = fileURLToPath(msg.params.textDocument.uri);
   let projectRootPath = utils.findProjectRootOfFile(filePath);
   let binaryPath = findBinary();
   if (binaryPath == null || projectRootPath == null) {
@@ -97,7 +39,13 @@ export function runCompletionCommand(
   try {
     let stdout = execFileSync(
       binaryPath,
-      ["complete", filePath, msg.params.position.line, msg.params.position.character, tmpname],
+      [
+        "complete",
+        filePath,
+        msg.params.position.line,
+        msg.params.position.character,
+        tmpname,
+      ],
       { cwd: projectRootPath }
     );
     return JSON.parse(stdout.toString());
@@ -109,10 +57,8 @@ export function runCompletionCommand(
   }
 }
 
-export function runHoverCommand(
-  msg: RequestMessage,
-): Hover | null {
-  let filePath = fileURLToPath(msg.params.textDocument.uri)
+export function runHoverCommand(msg: RequestMessage): Hover | null {
+  let filePath = fileURLToPath(msg.params.textDocument.uri);
   let projectRootPath = utils.findProjectRootOfFile(filePath);
   let binaryPath = findBinary();
   if (binaryPath == null || projectRootPath == null) {
@@ -122,7 +68,12 @@ export function runHoverCommand(
   try {
     let stdout = execFileSync(
       binaryPath,
-      ["hover", filePath, msg.params.position.line, msg.params.position.character],
+      [
+        "hover",
+        filePath,
+        msg.params.position.line,
+        msg.params.position.character,
+      ],
       { cwd: projectRootPath }
     );
     return JSON.parse(stdout.toString());
@@ -132,10 +83,8 @@ export function runHoverCommand(
   }
 }
 
-export function runDefinitionCommand(
-  msg: RequestMessage,
-): Location | null {
-  let filePath = fileURLToPath(msg.params.textDocument.uri)
+export function runDefinitionCommand(msg: RequestMessage): Location | null {
+  let filePath = fileURLToPath(msg.params.textDocument.uri);
   let projectRootPath = utils.findProjectRootOfFile(filePath);
   let binaryPath = findBinary();
   if (binaryPath == null || projectRootPath == null) {
@@ -145,7 +94,12 @@ export function runDefinitionCommand(
   try {
     let stdout = execFileSync(
       binaryPath,
-      ["definition", filePath, msg.params.position.line, msg.params.position.character],
+      [
+        "definition",
+        filePath,
+        msg.params.position.line,
+        msg.params.position.character,
+      ],
       { cwd: projectRootPath }
     );
     return JSON.parse(stdout.toString());

server/src/constants.ts

@@ -16,6 +16,21 @@ export let bscExeReScriptPartialPath = path.join(
   "bsc.exe"
 );
 
+let analysisBinariesFolder = path.join(
+  path.dirname(__dirname),
+  "analysis_binaries"
+);
+// For local development and CI tests
+export let analysisCurrentPlatformBinaryPath = path.join(
+  analysisBinariesFolder,
+  "current-platform.exe"
+);
+// Platform-specific production binaries manually downloaded from CI
+export let analysisProductionBinaryPath = path.join(
+  analysisBinariesFolder,
+  process.platform + ".exe"
+);
+
 // can't use the native bsb since we might need the watcher -w flag, which is only in the js wrapper
 // export let bsbPartialPath = path.join('node_modules', 'bs-platform', process.platform, 'bsb.exe');
 export let bsbNodePartialPath = path.join("node_modules", ".bin", "bsb");