fix(language-service): Do not cache empty analyzed modules

This commit fixes a bug whereby the empty set of analyzed modules is cached and subsequently produces the incorrect error 'Component ... is not included in a module...' PR Close angular#19405
kyliau · Jan 5, 2018 · 047f120 · 047f120
1 parent f9436f7
commit 047f120
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/packages/language-service/src/typescript_host.ts b/packages/language-service/src/typescript_host.ts
@@ -158,8 +158,8 @@ export class TypeScriptServiceHost implements LanguageServiceHost {
         const programFiles = this.program.getSourceFiles().map(sf => sf.fileName);
         analyzedModules =
             analyzeNgModules(programFiles, analyzeHost, this.staticSymbolResolver, this.resolver);
+        this.analyzedModules = analyzedModules;
       }
-      this.analyzedModules = analyzedModules;
     }
     return analyzedModules;
   }
@@ -634,4 +634,4 @@ function convertChain(chain: FormattedMessageChain): DiagnosticMessageChain {
 
 function errorToDiagnosticWithChain(error: FormattedError, span: Span): DeclarationError {
   return {message: error.chain ? convertChain(error.chain) : error.message, span};
-}
+}
diff --git a/packages/language-service/test/diagnostics_spec.ts b/packages/language-service/test/diagnostics_spec.ts
@@ -248,7 +248,7 @@ describe('diagnostics', () => {
           template: \`
             <div *ngIf="comps | async; let comps; else loading">
             </div>
-            <ng-template #loading>Loading comps...</ng-template>            
+            <ng-template #loading>Loading comps...</ng-template>
           \`
         })
         export class MyComponent {}

diff --git a/packages/language-service/test/typescript_host_spec.ts b/packages/language-service/test/typescript_host_spec.ts
@@ -46,4 +46,21 @@ describe('completions', () => {
     ngHost = new TypeScriptServiceHost(host, service);
     expect(() => ngHost.getAnalyzedModules()).not.toThrow();
   });
+
+  it('should not cache analyzed modules if there is none', () => {
+    // First create a TypescriptHost with empty script names
+    host = new MockTypescriptHost([], toh);
+    service = ts.createLanguageService(host);
+    ngHost = new TypeScriptServiceHost(host, service);
+    expect(ngHost.getAnalyzedModules().ngModules).toEqual([]);
+    // Now add a script
+    const fileName = '/app/main.ts';
+    const content = (host as MockTypescriptHost).getFileContent(fileName) !;
+    (host as MockTypescriptHost).addScript(fileName, content);
+    // Had we cached the empty analyzed modules earlier, we would get back an
+    // empty array. But if we didn't cache it, then the analyzed modules will
+    // be non-empty.
+    expect(ngHost.getAnalyzedModules().ngModules.length).not.toEqual(0);
+  });
+
 });