wire up the optional projectDirectory for @types support. Closes #231

alm-tools · Oct 9, 2016 · ba75e80 · ba75e80 · johnnyreilly · Oct 9, 2016
1 parent 7f9f306
commit ba75e80
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/src/app/monaco/model/classifierCache.ts b/src/app/monaco/model/classifierCache.ts
@@ -9,7 +9,7 @@
 import {TypedEvent} from "../../../common/events";
 import * as lsh from "../../../languageServiceHost/languageServiceHost";
 
-const languageServiceHost = new lsh.LanguageServiceHost();
+const languageServiceHost = new lsh.LanguageServiceHost(undefined);
 const languageService = ts.createLanguageService(languageServiceHost);
 
 export function addFile(filePath: string, contents: string) {

diff --git a/src/languageServiceHost/languageServiceHost.ts b/src/languageServiceHost/languageServiceHost.ts
@@ -238,8 +238,12 @@ export class LSHost implements ts.LanguageServiceHost {
     filenameToScript: ts.FileMap<ScriptInfo>;
     roots: ScriptInfo[] = [];
 
-    /** BAS: added compilation settings as an option */
-    constructor(public compilerOptions = defaultCompilerOptions) {
+    /**
+     * BAS: add configuration arguments
+     * - projectDirectory,
+     * - compilerOptions
+     */
+    constructor(public projectDirectory: string | undefined, public compilerOptions = defaultCompilerOptions) {
         this.filenameToScript = createFileMap<ScriptInfo>();
     }
 
@@ -274,10 +278,9 @@ export class LSHost implements ts.LanguageServiceHost {
         return this.getScriptInfo(filename).svc.latestVersion().toString();
     }
 
-    // BAS We work with full paths
-    getCurrentDirectory(): string {
-        return "";
-    }
+    // BAS : wired to config. Needed for proper `@types` expansion.
+    // See the child class `LanguageServiceHost` implementation below (with more comments).
+    getCurrentDirectory = () => this.projectDirectory;
 
     getScriptIsOpen(filename: string) {
         return this.getScriptInfo(filename).isOpen;
@@ -433,15 +436,17 @@ export class LanguageServiceHost extends LSHost {
      */
     getDirectories = ts.sys ? ts.sys.getDirectories : undefined;
 
-    /** For @types expansion */
+    /**
+     * For @types expansion, these two functions are needed.
+     */
     directoryExists = ts.sys ? ts.sys.directoryExists : undefined;
-    getCurrentDirectory() {
+    getCurrentDirectory = () => {
         /**
          * TODO: use the same path as the path of tsconfig.json (if any)
          * `undefined` is handled correctly in the compiler source :
          * https://github.com/Microsoft/TypeScript/blob/02493de5ccd9e8c4c901bb154ba584dee392bd14/src/compiler/moduleNameResolver.ts#L98
          */
-        return undefined;
+        return this.projectDirectory;
     }
 
     /**

diff --git a/src/server/lang/config/configService.ts b/src/server/lang/config/configService.ts
@@ -24,7 +24,7 @@ class Project {
     languageService: ts.LanguageService;
     languageServiceHost: lsh.LanguageServiceHost;
     constructor() {
-        this.languageServiceHost = new lsh.LanguageServiceHost({
+        this.languageServiceHost = new lsh.LanguageServiceHost(undefined, {
             allowNonTsExtensions: true,
             allowJs: true,
             noLib: true, // Will result in lots of errors but we don't want lib.d.ts completions

diff --git a/src/server/workers/lang/core/project.ts b/src/server/workers/lang/core/project.ts
@@ -24,7 +24,7 @@ export class Project {
     constructor(projectData: types.ProjectDataLoaded) {
         this.configFile = projectData.configFile;
 
-        this.languageServiceHost = new LanguageServiceHost(projectData.configFile.project.compilerOptions);
+        this.languageServiceHost = new LanguageServiceHost(projectData.configFile.projectFilePath, projectData.configFile.project.compilerOptions);
 
         // Add all the files
         projectData.filePathWithContents.forEach(({filePath,contents}) => {

diff --git a/src/server/workers/lint/lintWorker.ts b/src/server/workers/lint/lintWorker.ts
@@ -88,7 +88,7 @@ namespace LinterImplementation {
         /**
          * Create the program
          */
-        const languageServiceHost = new LanguageServiceHost(projectData.configFile.project.compilerOptions);
+        const languageServiceHost = new LanguageServiceHost(undefined, projectData.configFile.project.compilerOptions);
 
         // Add all the files
         projectData.filePathWithContents.forEach(({filePath, contents}) => {