Merge pull request microsoft#15240 from Microsoft/fixCrashFindingLocals

mhegazy · web-flow · commit 6de4693118d7 · 2017-04-18T14:40:26.000-07:00
Check if container has locals before looking up properties
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -2403,7 +2403,7 @@ namespace ts {
         }
 
         function lookupSymbolForName(name: string) {
-            return (container.symbol && container.symbol.exports && container.symbol.exports.get(name)) || container.locals.get(name);
+            return (container.symbol && container.symbol.exports && container.symbol.exports.get(name)) || (container.locals && container.locals.get(name));
         }
 
         function bindPropertyAssignment(functionName: string, propertyAccessExpression: PropertyAccessExpression, isPrototypeProperty: boolean) {
diff --git a/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.symbols b/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.symbols
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/foo.js ===
+module.exports = function () {
+>module : Symbol(export=, Decl(foo.js, 0, 0))
+>exports : Symbol(export=, Decl(foo.js, 0, 0))
+
+  class A { }
+>A : Symbol(A, Decl(foo.js, 0, 30))
+
+  return {
+    c: A.b = 1,
+>c : Symbol(c, Decl(foo.js, 2, 10))
+>A : Symbol(A, Decl(foo.js, 0, 30))
+  }
+};
+
diff --git a/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.types b/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.types
@@ -0,0 +1,24 @@
+=== tests/cases/compiler/foo.js ===
+module.exports = function () {
+>module.exports = function () {  class A { }  return {    c: A.b = 1,  }} : () => { [x: string]: any; c: number; }
+>module.exports : any
+>module : any
+>exports : any
+>function () {  class A { }  return {    c: A.b = 1,  }} : () => { [x: string]: any; c: number; }
+
+  class A { }
+>A : A
+
+  return {
+>{    c: A.b = 1,  } : { [x: string]: any; c: number; }
+
+    c: A.b = 1,
+>c : number
+>A.b = 1 : 1
+>A.b : any
+>A : typeof A
+>b : any
+>1 : 1
+  }
+};
+
diff --git a/tests/cases/compiler/jsFileClassPropertyInitalizationInObjectLiteral.ts b/tests/cases/compiler/jsFileClassPropertyInitalizationInObjectLiteral.ts
@@ -0,0 +1,10 @@
+// @allowJs: true
+// @noEmit: true
+
+// @filename: foo.js
+module.exports = function () {
+  class A { }
+  return {
+    c: A.b = 1,
+  }
+};

Original file line number	Diff line number	Diff line change
`@@ -2403,7 +2403,7 @@ namespace ts {`
`2403`	`2403`	`}`
`2404`	`2404`
`2405`	`2405`	`function lookupSymbolForName(name: string) {`
`2406`		`- return (container.symbol && container.symbol.exports && container.symbol.exports.get(name)) \|\| container.locals.get(name);`
	`2406`	`+ return (container.symbol && container.symbol.exports && container.symbol.exports.get(name)) \|\| (container.locals && container.locals.get(name));`
`2407`	`2407`	`}`
`2408`	`2408`
`2409`	`2409`	`function bindPropertyAssignment(functionName: string, propertyAccessExpression: PropertyAccessExpression, isPrototypeProperty: boolean) {`