Skip to content
Draft
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
18 changes: 5 additions & 13 deletions internal/checker/checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -13386,20 +13386,12 @@ func (c *Checker) getResolvedSymbolOrNil(node *ast.Node) *ast.Symbol {
return c.symbolNodeLinks.Get(node).resolvedSymbol
}

func (c *Checker) getResolvedSymbolNoDiagnostics(node *ast.Node) *ast.Symbol {
links := c.symbolNodeLinks.Get(node)
if links.resolvedSymbol != nil {
return links.resolvedSymbol
}
if links.resolvedSymbolNoDiagnostics == nil {
var symbol *ast.Symbol
if !ast.NodeIsMissing(node) {
symbol = c.resolveName(node, node.Text(), ast.SymbolFlagsValue|ast.SymbolFlagsExportValue,
nil, !ast.IsWriteOnlyAccess(node), false /*excludeGlobals*/)
}
links.resolvedSymbolNoDiagnostics = core.OrElse(symbol, c.unknownSymbol)
func (c *Checker) getReferencedValueOrAliasSymbol(reference *ast.Node) *ast.Symbol {
resolvedSymbol := c.symbolNodeLinks.Get(reference).resolvedSymbol
if resolvedSymbol != nil && resolvedSymbol != c.unknownSymbol {
return resolvedSymbol
}
return links.resolvedSymbolNoDiagnostics
return c.resolveName(reference, reference.Text(), ast.SymbolFlagsValue|ast.SymbolFlagsExportValue|ast.SymbolFlagsAlias, nil, true /*isUse*/, false /*excludeGlobals*/)
}
Comment on lines +13389 to 13395

func (c *Checker) getCannotFindNameDiagnosticForName(node *ast.Node) *diagnostics.Message {
Expand Down
8 changes: 6 additions & 2 deletions internal/checker/emitresolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ func (r *EmitResolver) getReferenceResolver() binder.ReferenceResolver {
if r.referenceResolver == nil {
r.referenceResolver = binder.NewReferenceResolver(r.checker.compilerOptions, binder.ReferenceResolverHooks{
ResolveName: r.checker.resolveName,
GetResolvedSymbol: r.checker.getResolvedSymbolNoDiagnostics,
GetResolvedSymbol: r.checker.getResolvedSymbolOrNil,
GetMergedSymbol: r.checker.getMergedSymbol,
GetParentOfSymbol: r.checker.getParentOfSymbol,
GetSymbolOfDeclaration: r.checker.getSymbolOfDeclaration,
Expand Down Expand Up @@ -864,7 +864,11 @@ func (r *EmitResolver) GetReferencedImportDeclaration(node *ast.IdentifierNode)
return r.jsxLinks.Get(node).importRef
}

return r.getReferenceResolver().GetReferencedImportDeclaration(node)
symbol := r.checker.getReferencedValueOrAliasSymbol(node)
if ast.IsNonLocalAlias(symbol, ast.SymbolFlagsValue) && r.checker.getTypeOnlyAliasDeclarationEx(symbol, ast.SymbolFlagsValue) == nil {
return r.checker.getDeclarationOfAliasSymbol(symbol)
}
return nil
}

func (r *EmitResolver) GetReferencedValueDeclaration(node *ast.IdentifierNode) *ast.Declaration {
Expand Down
3 changes: 1 addition & 2 deletions internal/checker/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,7 @@ type NodeLinks struct {
}

type SymbolNodeLinks struct {
resolvedSymbol *ast.Symbol // Resolved symbol associated with node
resolvedSymbolNoDiagnostics *ast.Symbol // Resolved symbol associated with node, generated without producing diagnostics for an API call
resolvedSymbol *ast.Symbol // Resolved symbol associated with node
}

type TypeNodeLinks struct {
Expand Down
Loading