isExpandoFunctionDeclaration only checks values (microsoft#27052)

sandersn · web-flow · commit 2f8a646f8e5b · 2018-09-12T12:21:50.000-07:00
Previously it checked types too, which caused a crash because types
don't have valueDeclaration set. But expando functions can't export
types, only values.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -28154,7 +28154,7 @@ namespace ts {
             if (!symbol || !(symbol.flags & SymbolFlags.Function)) {
                 return false;
             }
-            return !!forEachEntry(getExportsOfSymbol(symbol), p => isPropertyAccessExpression(p.valueDeclaration));
+            return !!forEachEntry(getExportsOfSymbol(symbol), p => p.flags & SymbolFlags.Value && isPropertyAccessExpression(p.valueDeclaration));
         }
 
         function getPropertiesOfContainerFunction(node: Declaration): Symbol[] {
diff --git a/tests/baselines/reference/declarationEmitOfFuncspace.js b/tests/baselines/reference/declarationEmitOfFuncspace.js
@@ -0,0 +1,23 @@
+//// [expando.ts]
+// #27032
+function ExpandoMerge(n: number) {
+    return n;
+}
+namespace ExpandoMerge {
+    export interface I { }
+}
+
+
+//// [expando.js]
+// #27032
+function ExpandoMerge(n) {
+    return n;
+}
+
+
+//// [expando.d.ts]
+declare function ExpandoMerge(n: number): number;
+declare namespace ExpandoMerge {
+    interface I {
+    }
+}
diff --git a/tests/baselines/reference/declarationEmitOfFuncspace.symbols b/tests/baselines/reference/declarationEmitOfFuncspace.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/expando.ts ===
+// #27032
+function ExpandoMerge(n: number) {
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 3, 1))
+>n : Symbol(n, Decl(expando.ts, 1, 22))
+
+    return n;
+>n : Symbol(n, Decl(expando.ts, 1, 22))
+}
+namespace ExpandoMerge {
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 3, 1))
+
+    export interface I { }
+>I : Symbol(I, Decl(expando.ts, 4, 24))
+}
+
diff --git a/tests/baselines/reference/declarationEmitOfFuncspace.types b/tests/baselines/reference/declarationEmitOfFuncspace.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/expando.ts ===
+// #27032
+function ExpandoMerge(n: number) {
+>ExpandoMerge : (n: number) => number
+>n : number
+
+    return n;
+>n : number
+}
+namespace ExpandoMerge {
+    export interface I { }
+}
+
diff --git a/tests/cases/compiler/declarationEmitOfFuncspace.ts b/tests/cases/compiler/declarationEmitOfFuncspace.ts
@@ -0,0 +1,9 @@
+// @declaration: true
+// @Filename: expando.ts
+// #27032
+function ExpandoMerge(n: number) {
+    return n;
+}
+namespace ExpandoMerge {
+    export interface I { }
+}

Original file line number	Diff line number	Diff line change
`@@ -28154,7 +28154,7 @@ namespace ts {`
`28154`	`28154`	`if (!symbol \|\| !(symbol.flags & SymbolFlags.Function)) {`
`28155`	`28155`	`return false;`
`28156`	`28156`	`}`
`28157`		`- return !!forEachEntry(getExportsOfSymbol(symbol), p => isPropertyAccessExpression(p.valueDeclaration));`
	`28157`	`+ return !!forEachEntry(getExportsOfSymbol(symbol), p => p.flags & SymbolFlags.Value && isPropertyAccessExpression(p.valueDeclaration));`
`28158`	`28158`	`}`
`28159`	`28159`
`28160`	`28160`	`function getPropertiesOfContainerFunction(node: Declaration): Symbol[] {`