Skip to content

Handle nil end position in getMappedLocation #1920

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 5 commits into from
Oct 22, 2025
Merged

Handle nil end position in getMappedLocation #1920

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17a4f9e
Handle nil end position in getMappedLocation
jakebailey Oct 22, 2025
6ffa90f
bitten by the local baselines again
jakebailey Oct 22, 2025
8103882
Revert unrelated changes
jakebailey Oct 22, 2025
eb68a0b
Remove baseline
jakebailey Oct 22, 2025
b760558
clamp position in PositionToLineAndCharacter maybe
jakebailey Oct 22, 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 @@ -167,7 +167,6 @@ TestDoubleUnderscoreCompletions
TestEditJsdocType
TestExportDefaultClass
TestExportDefaultFunction
TestFindAllRefsForDefaultExport03
TestFindAllRefsForModule
TestFindAllRefsModuleDotExports
TestFindReferencesBindingPatternInJsdocNoCrash1
Expand Down
2 changes: 1 addition & 1 deletion internal/fourslash/tests/gen/findAllRefsForDefaultExport03_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 TestFindAllRefsForDefaultExport03(t *testing.T) {
t.Parallel()
t.Skip()

defer testutil.RecoverAndFail(t, "Panic on fourslash test")
const content = `/*1*/function /*2*/f() {
return 100;
Expand Down
6 changes: 6 additions & 0 deletions internal/ls/source_map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ func (l *LanguageService) getMappedLocation(fileName string, fileRange core.Text
}
}
endPos := l.tryGetSourcePosition(fileName, core.TextPos(fileRange.End()))
if endPos == nil {
endPos = &sourcemap.DocumentPosition{
FileName: startPos.FileName,
Pos: startPos.Pos + fileRange.Len(),
Copy link
Member

@andrewbranch andrewbranch Oct 22, 2025

Choose a reason for hiding this comment

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

Looks right as a port, but since this is happening, do we need to ensure this position is inside the length of the file?

Copy link
Member Author

@jakebailey jakebailey Oct 22, 2025

Choose a reason for hiding this comment

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

I'm not sure; my understanding is that the conversion to an LSP range will clamp it via the line map, but maybe not... I can grab the script and min the text length.

Copy link
Member

@andrewbranch andrewbranch Oct 22, 2025

Choose a reason for hiding this comment

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

It looks like PositionToLineAndCharacter will crash with a slice range out of bounds when rescanning the line for the UTF-16 character offset. Maybe it’s worth adding a guard there and not worrying about it here.

Copy link
Member Author

@jakebailey jakebailey Oct 22, 2025

Choose a reason for hiding this comment

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

Hm, I can. I'm questioning whether or not it's a good idea, though, given we don't do the same sort of bounds checks when going from an LSP position to a byte position... Could go either way. Either way it's sort of papering over something.

}
}
debug.Assert(endPos.FileName == startPos.FileName, "start and end should be in same file")
newRange := core.NewTextRange(startPos.Pos, endPos.Pos)
lspRange := l.createLspRangeFromRange(newRange, l.getScript(startPos.FileName))
Expand Down
9 changes: 9 additions & 0 deletions ...data/baselines/reference/fourslash/documentHighlights/findAllRefsForModule.baseline.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// === documentHighlights ===
// === /b.ts ===
// import { x } from "/*HIGHLIGHTS*/[|./a|]";



// === documentHighlights ===
// === /c/sub.js ===
// const a = require("/*HIGHLIGHTS*/[|../a|]");
57 changes: 57 additions & 0 deletions ...aselines/reference/fourslash/documentHighlights/getOccurrencesIfElseBroken.baseline.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// === documentHighlights ===
// === /getOccurrencesIfElseBroken.ts ===
// /*HIGHLIGHTS*/[|if|] (true) {
// var x = 1;
// }
// [|else if|] ()
// [|else if|]
// [|else|] /* whar garbl */ [|if|] (if (true) { } else { })
// else



// === documentHighlights ===
// === /getOccurrencesIfElseBroken.ts ===
// [|if|] (true) {
// var x = 1;
// }
// /*HIGHLIGHTS*/[|else if|] ()
// [|else if|]
// [|else|] /* whar garbl */ [|if|] (if (true) { } else { })
// else



// === documentHighlights ===
// === /getOccurrencesIfElseBroken.ts ===
// [|if|] (true) {
// var x = 1;
// }
// [|else if|] ()
// /*HIGHLIGHTS*/[|else if|]
// [|else|] /* whar garbl */ [|if|] (if (true) { } else { })
// else



// === documentHighlights ===
// === /getOccurrencesIfElseBroken.ts ===
// [|if|] (true) {
// var x = 1;
// }
// [|else if|] ()
// [|else if|]
// /*HIGHLIGHTS*/[|else|] /* whar garbl */ [|if|] (if (true) { } else { })
// else



// === documentHighlights ===
// === /getOccurrencesIfElseBroken.ts ===
// [|if|] (true) {
// var x = 1;
// }
// [|else if|] ()
// [|else if|]
// [|else|] /* whar garbl */ /*HIGHLIGHTS*/[|if|] (if (true) { } else { })
// else
141 changes: 141 additions & 0 deletions ...elines/reference/fourslash/findAllReferences/findAllRefsForDefaultExport03.baseline.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
// === findAllReferences ===
// === /findAllRefsForDefaultExport03.ts ===
// /*FIND ALL REFS*/function [|f|]() {
// return 100;
// }
//
// export default [|f|];
//
// var x: typeof [|f|];
//
// var y = [|f|]();
//
// namespace [|f|] {
// var local = 100;
// }



// === findAllReferences ===
// === /findAllRefsForDefaultExport03.ts ===
// function /*FIND ALL REFS*/[|f|]() {
// return 100;
// }
//
// export default [|f|];
//
// var x: typeof [|f|];
//
// var y = [|f|]();
//
// namespace [|f|] {
// var local = 100;
// }



// === findAllReferences ===
// === /findAllRefsForDefaultExport03.ts ===
// function [|f|]() {
// return 100;
// }
//
// /*FIND ALL REFS*/export default [|f|];
//
// var x: typeof [|f|];
//
// var y = [|f|]();
//
// namespace [|f|] {
// var local = 100;
// }



// === findAllReferences ===
// === /findAllRefsForDefaultExport03.ts ===
// function [|f|]() {
// return 100;
// }
//
// export default /*FIND ALL REFS*/[|f|];
//
// var x: typeof [|f|];
//
// var y = [|f|]();
//
// namespace [|f|] {
// var local = 100;
// }



// === findAllReferences ===
// === /findAllRefsForDefaultExport03.ts ===
// function [|f|]() {
// return 100;
// }
//
// export default [|f|];
//
// var x: typeof /*FIND ALL REFS*/[|f|];
//
// var y = [|f|]();
//
// namespace [|f|] {
// var local = 100;
// }



// === findAllReferences ===
// === /findAllRefsForDefaultExport03.ts ===
// function [|f|]() {
// return 100;
// }
//
// export default [|f|];
//
// var x: typeof [|f|];
//
// var y = /*FIND ALL REFS*/[|f|]();
//
// namespace [|f|] {
// var local = 100;
// }



// === findAllReferences ===
// === /findAllRefsForDefaultExport03.ts ===
// function [|f|]() {
// return 100;
// }
//
// export default [|f|];
//
// var x: typeof [|f|];
//
// var y = [|f|]();
//
// /*FIND ALL REFS*/namespace [|f|] {
// var local = 100;
// }



// === findAllReferences ===
// === /findAllRefsForDefaultExport03.ts ===
// function [|f|]() {
// return 100;
// }
//
// export default [|f|];
//
// var x: typeof [|f|];
//
// var y = [|f|]();
//
// namespace /*FIND ALL REFS*/[|f|] {
// var local = 100;
// }
33 changes: 33 additions & 0 deletions testdata/baselines/reference/fourslash/findAllReferences/findAllRefsForModule.baseline.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// === findAllReferences ===
// === /b.ts ===
// import { x } from "/*FIND ALL REFS*/[|./a|]";

// === /c/sub.js ===
// const a = require("[|../a|]");

// === /d.ts ===
// /// <reference path="./a.ts" />[||]



// === findAllReferences ===
// === /b.ts ===
// import { x } from "[|./a|]";

// === /c/sub.js ===
// const a = require("/*FIND ALL REFS*/[|../a|]");

// === /d.ts ===
// /// <reference path="./a.ts" />[||]



// === findAllReferences ===
// === /b.ts ===
// import { x } from "[|./a|]";

// === /c/sub.js ===
// const a = require("[|../a|]");

// === /d.ts ===
// /// <reference path="/*FIND ALL REFS*/./a.ts" />[||]
3 changes: 3 additions & 0 deletions ...aselines/reference/fourslash/findAllReferences/findAllRefsModuleDotExports.baseline.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// === findAllReferences ===
// === /a.js ===
// /*FIND ALL REFS*/const [|b|] = require("./b");
Loading
Loading