feat: improve auto-import completion detail

axetroy · Mar 3, 2020 · 78fa0e8 · 78fa0e8
1 parent c790727
commit 78fa0e8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/core/deno_cache.ts b/core/deno_cache.ts
@@ -1,5 +1,6 @@
 import * as path from "path";
 import { URL } from "url";
+import assert from "assert";
 
 import { getDenoDepsDir } from "./deno";
 import { HashMeta } from "./hash_meta";
@@ -37,7 +38,12 @@ export class CacheModule implements DenoCacheModule {
     public filepath: string,
     public url: URL,
     private logger?: Logger
-  ) {}
+  ) {
+    assert(
+      path.isAbsolute(filepath),
+      `Deno Module filepath require absolute but got ${filepath}`
+    );
+  }
   /**
    * Resolve module in this cache file
    * @param moduleName The module name is for unix style

diff --git a/typescript-deno-plugin/src/plugin.ts b/typescript-deno-plugin/src/plugin.ts
@@ -7,6 +7,7 @@ import { Logger } from "./logger";
 import { ConfigurationManager, DenoPluginConfig } from "./configuration";
 import { getDenoDts } from "../../core/deno";
 import { ModuleResolver, ResolvedModule } from "../../core/module_resolver";
+import { CacheModule } from "../../core/deno_cache";
 import { pathExistsSync } from "../../core/util";
 import { normalizeImportStatement } from "../../core/deno_normalize_import_statement";
 import { readConfigurationFromVscodeSettings } from "../../core/vscode_settings";
@@ -146,7 +147,6 @@ export class DenoPlugin implements ts_module.server.PluginModule {
         containingFile: string,
         ...rest
       ) => {
-        // containingFile may not be a file path, it may be `untitled:^Untitled-1`
         if (!this.configurationManager.config.enable) {
           return resolveTypeReferenceDirectives(
             typeDirectiveNames,
@@ -240,7 +240,7 @@ export class DenoPlugin implements ts_module.server.PluginModule {
         return details;
       }
 
-      if (details) {
+      if (details && details.kindModifiers === "export") {
         if (details.codeActions && details.codeActions.length) {
           for (const ca of details.codeActions) {
             for (const change of ca.changes) {
@@ -252,6 +252,28 @@ export class DenoPlugin implements ts_module.server.PluginModule {
             }
           }
         }
+
+        if (details.source && details.source.length) {
+          for (const source of details.source) {
+            if (source.kind === "text") {
+              // text is always unix style
+              const text = source.text;
+
+              const absoluteFilepath = path.posix.resolve(text);
+
+              if (path.isAbsolute(absoluteFilepath)) {
+                const denoCache = CacheModule.create(
+                  absoluteFilepath,
+                  this.logger
+                );
+
+                if (denoCache) {
+                  source.text = denoCache.url.href;
+                }
+              }
+            }
+          }
+        }
       }
 
       return details;