maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix function merged with export as namespace sourcefile (#40908)

Browse source 
Previously it crashed because the function-checking code didn't expect
a node with no parent.
This commit is contained in:
Nathan Shively-Sanders 2020-10-02 10:50:12 -07:00 committed by GitHub
parent b8ebad48d7
commit 477e4b1a9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 55 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/checker.ts
View file

@ -32040,7 +32040,7 @@ namespace ts {
for (const current of declarations) {
const node = <SignatureDeclaration | ClassDeclaration | ClassExpression>current;
const inAmbientContext = node.flags & NodeFlags.Ambient;
const inAmbientContextOrInterface = node.parent.kind === SyntaxKind.InterfaceDeclaration || node.parent.kind === SyntaxKind.TypeLiteral || inAmbientContext;
const inAmbientContextOrInterface = node.parent && (node.parent.kind === SyntaxKind.InterfaceDeclaration || node.parent.kind === SyntaxKind.TypeLiteral) || inAmbientContext;
if (inAmbientContextOrInterface) {
// check if declarations are consecutive only if they are non-ambient
// 1. ambient declarations can be interleaved

14
tests/baselines/reference/sourceFileMergeWithFunction.js Normal file
View file

@ -0,0 +1,14 @@
//// [tests/cases/conformance/salsa/sourceFileMergeWithFunction.ts] ////
//// [types.d.ts]
declare function foo(props: any): any;
export default foo;
export as namespace foo;
//// [foo.ts]
/// <reference path="types.d.ts" />
declare function foo(): any;
//// [foo.js]
/// <reference path="types.d.ts" />

16
tests/baselines/reference/sourceFileMergeWithFunction.symbols Normal file
View file

@ -0,0 +1,16 @@
=== tests/cases/conformance/salsa/foo.ts ===
/// <reference path="types.d.ts" />
declare function foo(): any;
>foo : Symbol(foo, Decl(types.d.ts, 0, 0), Decl(foo.ts, 0, 0))
=== tests/cases/conformance/salsa/types.d.ts ===
declare function foo(props: any): any;
>foo : Symbol(foo, Decl(types.d.ts, 0, 0))
>props : Symbol(props, Decl(types.d.ts, 0, 21))
export default foo;
>foo : Symbol(foo, Decl(types.d.ts, 0, 0))
export as namespace foo;
>foo : Symbol(foo, Decl(types.d.ts, 1, 19))

16
tests/baselines/reference/sourceFileMergeWithFunction.types Normal file
View file

@ -0,0 +1,16 @@
=== tests/cases/conformance/salsa/foo.ts ===
/// <reference path="types.d.ts" />
declare function foo(): any;
>foo : typeof import("tests/cases/conformance/salsa/types")
=== tests/cases/conformance/salsa/types.d.ts ===
declare function foo(props: any): any;
>foo : (props: any) => any
>props : any
export default foo;
>foo : (props: any) => any
export as namespace foo;
>foo : typeof import("tests/cases/conformance/salsa/types")

8
tests/cases/conformance/salsa/sourceFileMergeWithFunction.ts Normal file
View file

@ -0,0 +1,8 @@
// @Filename: types.d.ts
declare function foo(props: any): any;
export default foo;
export as namespace foo;
// @Filename: foo.ts
/// <reference path="types.d.ts" />
declare function foo(): any;