Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29150,7 +29150,7 @@ namespace ts {
}
}

function checkExportsOnMergedDeclarations(node: Node): void {
function checkExportsOnMergedDeclarations(node: Declaration): void {
if (!produceDiagnostics) {
return;
}
Expand Down Expand Up @@ -32456,6 +32456,7 @@ namespace ts {
checkGrammarDecoratorsAndModifiers(node);

checkTypeNameIsReserved(node.name, Diagnostics.Type_alias_name_cannot_be_0);
checkExportsOnMergedDeclarations(node);
checkTypeParameters(node.typeParameters);
checkSourceElement(node.type);
registerForUnusedIdentifiersCheck(node);
Expand Down
12 changes: 12 additions & 0 deletions tests/baselines/reference/typeAliasesDoNotMerge.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
tests/cases/conformance/types/typeAliases/typeAliasesDoNotMerge.ts(1,13): error TS2395: Individual declarations in merged declaration 'A' must be all exported or all local.
tests/cases/conformance/types/typeAliases/typeAliasesDoNotMerge.ts(2,6): error TS2395: Individual declarations in merged declaration 'A' must be all exported or all local.


==== tests/cases/conformance/types/typeAliases/typeAliasesDoNotMerge.ts (2 errors) ====
export type A = {}
~
!!! error TS2395: Individual declarations in merged declaration 'A' must be all exported or all local.
type A = {}
~
!!! error TS2395: Individual declarations in merged declaration 'A' must be all exported or all local.

8 changes: 8 additions & 0 deletions tests/baselines/reference/typeAliasesDoNotMerge.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//// [typeAliasesDoNotMerge.ts]
export type A = {}
type A = {}


//// [typeAliasesDoNotMerge.js]
"use strict";
exports.__esModule = true;
7 changes: 7 additions & 0 deletions tests/baselines/reference/typeAliasesDoNotMerge.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/conformance/types/typeAliases/typeAliasesDoNotMerge.ts ===
export type A = {}
>A : Symbol(A, Decl(typeAliasesDoNotMerge.ts, 0, 0))

type A = {}
>A : Symbol(A, Decl(typeAliasesDoNotMerge.ts, 0, 0), Decl(typeAliasesDoNotMerge.ts, 0, 18))

7 changes: 7 additions & 0 deletions tests/baselines/reference/typeAliasesDoNotMerge.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/conformance/types/typeAliases/typeAliasesDoNotMerge.ts ===
export type A = {}
>A : import("tests/cases/conformance/types/typeAliases/typeAliasesDoNotMerge").A

type A = {}
>A : import("tests/cases/conformance/types/typeAliases/typeAliasesDoNotMerge").A

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export type A = {}
type A = {}