Add getCurrentDirectory to ServerHost

zhengbli · zhengbli · commit 6ff91b84aba9 · 2016-06-28T11:53:30.000-07:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -187,8 +187,22 @@ namespace ts {
     const typeReferenceExtensions = [".d.ts"];
 
     function getEffectiveTypeRoots(options: CompilerOptions, host: ModuleResolutionHost) {
-        return options.typeRoots ||
-            map(defaultTypeRoots, d => combinePaths(options.configFilePath ? getDirectoryPath(options.configFilePath) : host.getCurrentDirectory(), d));
+        if (options.typeRoots) {
+            return options.typeRoots;
+        }
+
+        let currentDirectory: string;
+        if (options.configFilePath) {
+            currentDirectory = getDirectoryPath(options.configFilePath);
+        }
+        else if (host.getCurrentDirectory) {
+            currentDirectory = host.getCurrentDirectory();
+        }
+
+        if (!currentDirectory) {
+            return undefined;
+        }
+        return map(defaultTypeRoots, d => combinePaths(currentDirectory, d));
     }
 
     /**
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -113,6 +113,7 @@ namespace ts.server {
             this.moduleResolutionHost = {
                 fileExists: fileName => this.fileExists(fileName),
                 readFile: fileName => this.host.readFile(fileName),
+                getCurrentDirectory: () => this.host.getCurrentDirectory(),
                 directoryExists: directoryName => this.host.directoryExists(directoryName)
             };
         }
diff --git a/tests/cases/fourslash/server/typeReferenceOnServer.ts b/tests/cases/fourslash/server/typeReferenceOnServer.ts
@@ -0,0 +1,9 @@
+/// <reference path='../fourslash.ts' />
+
+/////// <reference types="foo" />
+////var x: number;
+////x./*1*/
+
+goTo.marker("1");
+verify.not.completionListIsEmpty();
+

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ namespace ts.server {`
`113`	`113`	`this.moduleResolutionHost = {`
`114`	`114`	`fileExists: fileName => this.fileExists(fileName),`
`115`	`115`	`readFile: fileName => this.host.readFile(fileName),`
	`116`	`+ getCurrentDirectory: () => this.host.getCurrentDirectory(),`
`116`	`117`	`directoryExists: directoryName => this.host.directoryExists(directoryName)`
`117`	`118`	`};`
`118`	`119`	`}`