refactor: refactor code

axetroy · Jan 30, 2020 · a9760fe · a9760fe
1 parent 749e181
commit a9760fe
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 28 deletions.
diff --git a/client/src/extension.ts b/client/src/extension.ts
@@ -41,12 +41,14 @@ interface DenoInfo {
   DENO_DIR: string;
   version: string;
   executablePath: string;
+  dtsFilepath: string;
 }
 
 let denoInfo: DenoInfo = {
   DENO_DIR: "",
   version: "",
-  executablePath: ""
+  executablePath: "",
+  dtsFilepath: ""
 };
 
 const config: SynchronizedConfiguration = {
@@ -167,9 +169,9 @@ function synchronizeConfiguration(api: TypescriptAPI) {
   const config = getConfiguration();
 
   if (!config.dtsFilepaths) {
-    const dtsFilepath = getDenoDtsFilepath();
+    const dtsFilepath = denoInfo.dtsFilepath;
     if (dtsFilepath) {
-      config.dtsFilepaths = [getDenoDtsFilepath()];
+      config.dtsFilepaths = [dtsFilepath];
     }
   }
 
@@ -216,13 +218,6 @@ function withConfigValue<C, K extends Extract<keyof C, string>>(
   }
 }
 
-function getDenoDtsFilepath(): string {
-  if (!denoInfo.DENO_DIR) {
-    return "";
-  }
-  return path.join(denoInfo.DENO_DIR, "lib.deno_runtime.d.ts");
-}
-
 // get typescript api from build-in extension
 // https://github.com/microsoft/vscode/blob/master/extensions/typescript-language-features/src/api.ts
 async function getTypescriptAPI(): Promise<TypescriptAPI> {

diff --git a/server/src/deno.ts b/server/src/deno.ts
@@ -1,6 +1,7 @@
 import { Readable } from "stream";
 import execa from "execa";
 import which from "which";
+import { join } from "path";
 
 interface Version {
   deno: string;
@@ -26,7 +27,8 @@ interface FormatOptions {
 class Deno {
   public version!: Version | void;
   public executablePath!: string | void;
-  public DENO_DIR = this.getDenoDir();
+  public readonly DENO_DIR = this.getDenoDir();
+  public readonly dtsFilepath = join(this.DENO_DIR, "lib.deno_runtime.d.ts");
   constructor() {}
   public async init() {
     this.executablePath = await this.getExecutablePath();

diff --git a/server/src/server.ts b/server/src/server.ts
@@ -61,31 +61,29 @@ connection.onInitialize(
   }
 );
 
-function getDenoDtsFilepath(): string {
-  return path.join(deno.DENO_DIR, "lib.deno_runtime.d.ts");
-}
-
 connection.onInitialized(async () => {
   try {
     await deno.init();
     const currentDenoTypesContent = await deno.getTypes();
-    const typeFilepath = getDenoDtsFilepath();
-    const isExistDtsFile = await isFilepathExist(typeFilepath);
+    const isExistDtsFile = await isFilepathExist(deno.dtsFilepath);
+    const fileOptions = { encoding: "utf8" };
 
     // if dst file not exist. then create a new one
     if (!isExistDtsFile) {
-      await fs.writeFile(typeFilepath, currentDenoTypesContent, {
-        encoding: "utf8"
-      });
+      await fs.writeFile(
+        deno.dtsFilepath,
+        currentDenoTypesContent,
+        fileOptions
+      );
     } else {
-      const typesContent = await fs.readFile(typeFilepath, {
-        encoding: "utf8"
-      });
+      const typesContent = await fs.readFile(deno.dtsFilepath, fileOptions);
 
       if (typesContent.toString() !== currentDenoTypesContent.toString()) {
-        await fs.writeFile(typeFilepath, currentDenoTypesContent, {
-          encoding: "utf8"
-        });
+        await fs.writeFile(
+          deno.dtsFilepath,
+          currentDenoTypesContent,
+          fileOptions
+        );
       }
     }
   } catch (err) {
@@ -95,9 +93,10 @@ connection.onInitialized(async () => {
   connection.sendNotification("init", {
     version: deno.version ? deno.version.deno : undefined,
     executablePath: deno.executablePath,
-    DENO_DIR: deno.DENO_DIR
+    DENO_DIR: deno.DENO_DIR,
+    dtsFilepath: deno.dtsFilepath
   });
-  connection.console.log("server start");
+  connection.console.log("server initialized.");
 });
 
 connection.onDocumentFormatting(async params => {