Skip to content

Port TypeScript PR #60195: Allow reusing error type annotations in isolated declarations #1849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Port TypeScript PR #60195: Allow reusing error type annotations in isolated declarations #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b59bc
Initial plan
Copilot Oct 9, 2025
dc96d16
Port TypeScript PR #60195: Allow reusing error type annotations
Copilot Oct 9, 2025
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
16 changes: 16 additions & 0 deletions internal/checker/nodebuilderimpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,13 @@ func (b *nodeBuilderImpl) tryReuseExistingNonParameterTypeNode(existing *ast.Typ
if annotationType == nil {
annotationType = b.getTypeFromTypeNode(existing, true)
}
if annotationType != nil && b.ch.isErrorType(annotationType) {
// allow "reusing" type nodes that resolve to error types
// those can't truly be reused but it prevents cascading errors in isolatedDeclarations
// for source with errors there is no guarantee to emit correct code anyway
// Since tryReuseExistingTypeNodeHelper is not yet implemented, directly return the existing node
Copy link

Copilot AI Oct 9, 2025

Choose a reason for hiding this comment

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

This comment references tryReuseExistingTypeNodeHelper being 'not yet implemented', but the function is called on line 422. The comment should be updated to accurately reflect the current state or removed if no longer relevant.

Suggested change
// Since tryReuseExistingTypeNodeHelper is not yet implemented, directly return the existing node

Copilot uses AI. Check for mistakes.

return existing
}
if annotationType != nil && b.typeNodeIsEquivalentToType(host, t, annotationType) && b.existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, t) {
result := b.tryReuseExistingTypeNodeHelper(existing)
if result != nil {
Expand Down Expand Up @@ -2006,6 +2013,15 @@ func (b *nodeBuilderImpl) serializeTypeForDeclaration(declaration *ast.Declarati
t = b.ch.getOptionalType(t, false)
}

// Try to reuse existing type annotation if present
if declaration != nil && declaration.Type() != nil {
typeAnnotation := declaration.Type()
reused := b.tryReuseExistingTypeNode(typeAnnotation, t, declaration, addUndefinedForParameter)
if reused != nil {
return reused
}
}

restoreFlags := b.saveRestoreFlags()
if t.flags&TypeFlagsUniqueESSymbol != 0 && t.symbol == symbol && (b.ctx.enclosingDeclaration == nil || core.Some(symbol.Declarations, func(d *ast.Declaration) bool {
return ast.GetSourceFileOfNode(d) == b.ctx.enclosingFile
Expand Down
20 changes: 0 additions & 20 deletions testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorTypes1.js.diff
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorTypes1.types.diff
View file
Open in desktop

This file was deleted.

Loading