Skip to content
Closed
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
4 changes: 2 additions & 2 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7688,7 +7688,7 @@ namespace ts {
// Handle catch clause variables
const declaration = symbol.valueDeclaration;
if (isCatchClauseVariableDeclarationOrBindingElement(declaration)) {
return anyType;
return tryGetTypeFromEffectiveTypeNode(declaration) === unknownType ? unknownType : anyType;
}
// Handle export default expressions
if (isSourceFile(declaration) && isJsonSourceFile(declaration)) {
Expand Down Expand Up @@ -32140,7 +32140,7 @@ namespace ts {
if (catchClause) {
// Grammar checking
if (catchClause.variableDeclaration) {
if (catchClause.variableDeclaration.type) {
if (catchClause.variableDeclaration.type && tryGetTypeFromEffectiveTypeNode(catchClause.variableDeclaration) !== unknownType) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #36775 (comment)

Suggested change
if (catchClause.variableDeclaration.type && tryGetTypeFromEffectiveTypeNode(catchClause.variableDeclaration) !== unknownType) {
if (catchClause.variableDeclaration.type && tryGetTypeFromEffectiveTypeNode(catchClause.variableDeclaration) !== anyType && tryGetTypeFromEffectiveTypeNode(catchClause.variableDeclaration) !== unknownType) {

grammarErrorOnFirstToken(catchClause.variableDeclaration.type, Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation);
}
else if (catchClause.variableDeclaration.initializer) {
Expand Down
19 changes: 19 additions & 0 deletions tests/baselines/reference/catchClauseWithUnknownTypeAnnotation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//// [catchClauseWithUnknownTypeAnnotation.ts]
try {
} catch (e: unknown) {
}
type UnknownAlias = unknown;
try {
} catch (e: UnknownAlias) {
}


//// [catchClauseWithUnknownTypeAnnotation.js]
try {
}
catch (e) {
}
try {
}
catch (e) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
=== tests/cases/compiler/catchClauseWithUnknownTypeAnnotation.ts ===
try {
} catch (e: unknown) {
>e : Symbol(e, Decl(catchClauseWithUnknownTypeAnnotation.ts, 1, 9))
}
type UnknownAlias = unknown;
>UnknownAlias : Symbol(UnknownAlias, Decl(catchClauseWithUnknownTypeAnnotation.ts, 2, 1))

try {
} catch (e: UnknownAlias) {
>e : Symbol(e, Decl(catchClauseWithUnknownTypeAnnotation.ts, 5, 9))
>UnknownAlias : Symbol(UnknownAlias, Decl(catchClauseWithUnknownTypeAnnotation.ts, 2, 1))
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/catchClauseWithUnknownTypeAnnotation.ts ===
try {
} catch (e: unknown) {
>e : unknown
}
type UnknownAlias = unknown;
>UnknownAlias : unknown

try {
} catch (e: UnknownAlias) {
>e : unknown
}

7 changes: 7 additions & 0 deletions tests/cases/compiler/catchClauseWithUnknownTypeAnnotation.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
try {
} catch (e: unknown) {
}
type UnknownAlias = unknown;
try {
} catch (e: UnknownAlias) {
}