Fix crash on non-dts-require (microsoft#19980)

weswigham · web-flow · commit 7d93434f2cbf · 2017-11-13T16:41:29.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17179,7 +17179,7 @@ namespace ts {
             if (targetDeclarationKind !== SyntaxKind.Unknown) {
                 const decl = getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
                 // function/variable declaration should be ambient
-                return !!(decl.flags & NodeFlags.Ambient);
+                return !!decl && !!(decl.flags & NodeFlags.Ambient);
             }
             return false;
         }
diff --git a/tests/baselines/reference/noCrashOnParameterNamedRequire.js b/tests/baselines/reference/noCrashOnParameterNamedRequire.js
@@ -0,0 +1,11 @@
+//// [index.js]
+(function(require, module, exports){
+    const mod = require("./mod");
+    mod.foo;
+})(null, null, null);
+
+//// [index.js]
+(function (require, module, exports) {
+    var mod = require("./mod");
+    mod.foo;
+})(null, null, null);
diff --git a/tests/baselines/reference/noCrashOnParameterNamedRequire.symbols b/tests/baselines/reference/noCrashOnParameterNamedRequire.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/index.js ===
+(function(require, module, exports){
+>require : Symbol(require, Decl(index.js, 0, 10))
+>module : Symbol(module, Decl(index.js, 0, 18))
+>exports : Symbol(exports, Decl(index.js, 0, 26))
+
+    const mod = require("./mod");
+>mod : Symbol(mod, Decl(index.js, 1, 9))
+>require : Symbol(require, Decl(index.js, 0, 10))
+
+    mod.foo;
+>mod : Symbol(mod, Decl(index.js, 1, 9))
+
+})(null, null, null);
diff --git a/tests/baselines/reference/noCrashOnParameterNamedRequire.types b/tests/baselines/reference/noCrashOnParameterNamedRequire.types
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/index.js ===
+(function(require, module, exports){
+>(function(require, module, exports){    const mod = require("./mod");    mod.foo;})(null, null, null) : void
+>(function(require, module, exports){    const mod = require("./mod");    mod.foo;}) : (require: any, module: any, exports: any) => void
+>function(require, module, exports){    const mod = require("./mod");    mod.foo;} : (require: any, module: any, exports: any) => void
+>require : any
+>module : any
+>exports : any
+
+    const mod = require("./mod");
+>mod : any
+>require("./mod") : any
+>require : any
+>"./mod" : "./mod"
+
+    mod.foo;
+>mod.foo : any
+>mod : any
+>foo : any
+
+})(null, null, null);
+>null : null
+>null : null
+>null : null
+
diff --git a/tests/cases/compiler/noCrashOnParameterNamedRequire.ts b/tests/cases/compiler/noCrashOnParameterNamedRequire.ts
@@ -0,0 +1,8 @@
+// @allowJs: true
+// @checkJs: true
+// @outDir: ./built
+// @filename: index.js
+(function(require, module, exports){
+    const mod = require("./mod");
+    mod.foo;
+})(null, null, null);

Original file line number	Diff line number	Diff line change
`@@ -17179,7 +17179,7 @@ namespace ts {`
`17179`	`17179`	`if (targetDeclarationKind !== SyntaxKind.Unknown) {`
`17180`	`17180`	`const decl = getDeclarationOfKind(resolvedRequire, targetDeclarationKind);`
`17181`	`17181`	`// function/variable declaration should be ambient`
`17182`		`- return !!(decl.flags & NodeFlags.Ambient);`
	`17182`	`+ return !!decl && !!(decl.flags & NodeFlags.Ambient);`
`17183`	`17183`	`}`
`17184`	`17184`	`return false;`
`17185`	`17185`	`}`