fix(language-service): resolve the variable from the template context first (#35982)

ivanwonder · matsko · commit f882ff01f34a · 2020-03-10T13:27:04.000-04:00
PR Close #35982
diff --git a/packages/language-service/src/expression_diagnostics.ts b/packages/language-service/src/expression_diagnostics.ts
@@ -91,10 +91,8 @@ function getVarDeclarations(
       continue;
     }
     for (const variable of current.variables) {
-      let symbol = info.members.get(variable.value);
-      if (!symbol) {
-        symbol = getVariableTypeFromDirectiveContext(variable.value, info.query, current);
-      }
+      let symbol = getVariableTypeFromDirectiveContext(variable.value, info.query, current);
+
       const kind = info.query.getTypeKind(symbol);
       if (kind === BuiltinType.Any || kind === BuiltinType.Unbound) {
         // For special cases such as ngFor and ngIf, the any type is not very useful.
diff --git a/packages/language-service/test/project/app/parsing-cases.ts b/packages/language-service/test/project/app/parsing-cases.ts
@@ -170,6 +170,8 @@ export class TemplateReference {
   primitiveIndexType: {[name: string]: string} = {};
   anyValue: any;
   optional?: string;
+  // Use to test the `index` variable conflict between the `ngFor` and component context.
+  index = null;
   myClick(event: any) {}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,8 @@ export class TemplateReference {`
`170`	`170`	`primitiveIndexType: {[name: string]: string} = {};`
`171`	`171`	`anyValue: any;`
`172`	`172`	`optional?: string;`
	`173`	+ // Use to test the `index` variable conflict between the `ngFor` and component context.
	`174`	`+ index = null;`
`173`	`175`	`myClick(event: any) {}`
`174`	`176`	`}`
`175`	`177`