refactor: improve code

axetroy · Mar 7, 2020 · 1a2b7b6 · 1a2b7b6
1 parent a8965b5
commit 1a2b7b6
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/core/util.test.ts b/core/util.test.ts
@@ -4,7 +4,8 @@ import {
   str2regexpStr,
   isHttpURL,
   hashURL,
-  normalizeFilepath
+  normalizeFilepath,
+  isValidDenoDocument
 } from "./util";
 
 test("core / util / pathExists", async () => {
@@ -54,3 +55,12 @@ test("core / util / normalizeFilepath", () => {
 
   expect(normalizeFilepath("d:\\path\\to\\file")).toEqual("D:\\path\\to\\file");
 });
+
+test("core / util / isValidDenoDocument", () => {
+  expect(isValidDenoDocument("foo")).toBe(false);
+  expect(isValidDenoDocument("bar")).toBe(false);
+  expect(isValidDenoDocument("javascript")).toBe(true);
+  expect(isValidDenoDocument("javascriptreact")).toBe(true);
+  expect(isValidDenoDocument("typescript")).toBe(true);
+  expect(isValidDenoDocument("typescriptreact")).toBe(true);
+});
diff --git a/core/util.ts b/core/util.ts
@@ -65,3 +65,12 @@ export function hashURL(url: URL): string {
     .update(url.pathname + url.search)
     .digest("hex");
 }
+
+export function isValidDenoDocument(languageID: string): boolean {
+  return [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ].includes(languageID);
+}
diff --git a/server/src/language/definition.ts b/server/src/language/definition.ts
@@ -5,10 +5,10 @@ import {
   Location
 } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import * as ts from "typescript";
 import { URI } from "vscode-uri";
 
 import { getDenoTypesHintsFromDocument } from "../deno_types";
+import { pathExists } from "../../../core/util";
 
 export class Definition {
   constructor(connection: IConnection, documents: TextDocuments<TextDocument>) {
@@ -33,7 +33,7 @@ export class Definition {
           position.character >= start.character &&
           position.character <= end.character
         ) {
-          if (ts.sys.fileExists(typeComment.filepath)) {
+          if ((await pathExists(typeComment.filepath)) === true) {
             locations.push(
               Location.create(
                 URI.file(typeComment.filepath).toString(),

diff --git a/server/src/language/diagnostics.ts b/server/src/language/diagnostics.ts
@@ -16,7 +16,7 @@ import { localize } from "vscode-nls-i18n";
 
 import { Bridge } from "../bridge";
 import { ModuleResolver } from "../../../core/module_resolver";
-import { pathExists, isHttpURL } from "../../../core/util";
+import { pathExists, isHttpURL, isValidDenoDocument } from "../../../core/util";
 import { ImportMap } from "../../../core/import_map";
 import { getImportModules } from "../../../core/deno_deps";
 
@@ -108,7 +108,7 @@ export class Diagnostics {
     documents.onDidChangeContent(params => this.diagnosis(params.document));
   }
   async generate(document: TextDocument): Promise<Diagnostic[]> {
-    if (!["typescript", "typescriptreact"].includes(document.languageId)) {
+    if (!isValidDenoDocument(document.languageId)) {
       return [];
     }
 

diff --git a/server/src/language/references.ts b/server/src/language/references.ts
@@ -5,10 +5,10 @@ import {
   Location
 } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import * as ts from "typescript";
 import { URI } from "vscode-uri";
 
 import { getDenoTypesHintsFromDocument } from "../deno_types";
+import { pathExists } from "../../../core/util";
 
 export class References {
   constructor(connection: IConnection, documents: TextDocuments<TextDocument>) {
@@ -33,7 +33,7 @@ export class References {
           position.character >= start.character &&
           position.character <= end.character
         ) {
-          if (ts.sys.fileExists(typeComment.filepath)) {
+          if ((await pathExists(typeComment.filepath)) === true) {
             locations.push(
               Location.create(
                 URI.file(typeComment.filepath).toString(),