Skip to content

Compare names before symbols when matching flow references #64868

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

Open
Jake Bailey (jakebailey) wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −2
Open

Compare names before symbols when matching flow references #64868

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions tsc/internal/checker/flow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,8 +1610,19 @@ func (c *Checker) isMatchingReference(source *ast.Node, target *ast.Node) bool {
if ast.IsThisInTypeQuery(source) {
return target.Kind == ast.KindThisKeyword
}
return ast.IsIdentifier(target) && c.getResolvedSymbol(source) == c.getResolvedSymbol(target) ||
(ast.IsVariableDeclaration(target) || ast.IsBindingElement(target)) && c.getExportSymbolOfValueSymbolIfExported(c.getResolvedSymbol(source)) == c.getSymbolOfDeclaration(target)
if ast.IsIdentifier(target) {
return c.getResolvedSymbol(source) == c.getResolvedSymbol(target)
}
if ast.IsVariableDeclaration(target) || ast.IsBindingElement(target) {
// A declaration's symbol is named by its identifier, so a reference with a
// different name cannot resolve to it. Checking names first avoids loading
// the symbols of every unrelated declaration seen while walking flow nodes.
if name := target.Name(); name != nil && ast.IsIdentifier(name) && name.AsIdentifier().Text != source.Text() {
return false
}
return c.getExportSymbolOfValueSymbolIfExported(c.getResolvedSymbol(source)) == c.getSymbolOfDeclaration(target)
}
return false
case ast.KindThisKeyword:
return target.Kind == ast.KindThisKeyword
case ast.KindSuperKeyword:
Expand Down
Loading