Skip to content

Fix nil pointer dereference in getAdjustedLocation for type-only exports #2090

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

Merged
jakebailey merged 4 commits into from
Nov 14, 2025
Merged

Fix nil pointer dereference in getAdjustedLocation for type-only exports #2090

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e922ac
Initial plan
Copilot Nov 14, 2025
9e3e34a
Fix panic in getAdjustedLocation for documentHighlight requests
Copilot Nov 14, 2025
51b3e5e
Update failing test list after getAdjustedLocation fix
Copilot Nov 14, 2025
abea7a8
Remove unnecessary nil check for ImportClause parent
Copilot Nov 14, 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
1 change: 0 additions & 1 deletion internal/fourslash/_scripts/failingTests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,6 @@ TestQuickinfoForNamespaceMergeWithClassConstrainedToSelf
TestQuickinfoForUnionProperty
TestQuickinfoWrongComment
TestRecursiveInternalModuleImport
TestReferencesForStatementKeywords
TestReferencesInEmptyFile
TestRegexDetection
TestRenameForAliasingExport02
Expand Down
2 changes: 1 addition & 1 deletion internal/fourslash/tests/gen/referencesForStatementKeywords_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func TestReferencesForStatementKeywords(t *testing.T) {
t.Parallel()
t.Skip()

defer testutil.RecoverAndFail(t, "Panic on fourslash test")
const content = `// @filename: /main.ts
// import ... = ...
Expand Down
8 changes: 5 additions & 3 deletions internal/ls/utilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,16 +905,18 @@ func getAdjustedLocation(node *ast.Node, forRename bool, sourceFile *ast.SourceF
// import /**/type { propertyName as [|name|] } from ...;
// import /**/type ... from "[|module|]";
if ast.IsImportClause(parent) && parent.IsTypeOnly() {
if location := getAdjustedLocationForImportDeclaration(parent.Parent.AsImportDeclaration(), forRename); location != nil {
return location
if parent.Parent != nil {
if location := getAdjustedLocationForImportDeclaration(parent.Parent.AsImportDeclaration(), forRename); location != nil {
return location
}
}
}
// export /**/type { [|name|] } from ...;
// export /**/type { propertyName as [|name|] } from ...;
// export /**/type * from "[|module|]";
// export /**/type * as ... from "[|module|]";
if ast.IsExportDeclaration(parent) && parent.IsTypeOnly() {
if location := getAdjustedLocationForExportDeclaration(parent.Parent.AsExportDeclaration(), forRename); location != nil {
if location := getAdjustedLocationForExportDeclaration(parent.AsExportDeclaration(), forRename); location != nil {
return location
}
}
Expand Down
Loading