Rename line maps with ECMA/LSP prefix #1786
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR renames line map-related functions to distinguish between ECMA line maps and LSP line maps. ECMA line maps consider additional characters (like various Unicode line breaks) as line separators beyond just \n and \r\n, while LSP uses only standard line terminators.
Key changes:
- Renamed functions from
GetLineAndCharacterOfPositiontoGetECMALineAndCharacterOfPosition - Updated
ComputeLineStartstoComputeECMALineStarts - Changed
LineMapinterface methods toECMALineMap
Reviewed Changes
Copilot reviewed 35 out of 35 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| internal/transformers/utilities.go | Updates function calls to use ECMA line position functions |
| internal/transformers/jsxtransforms/jsx.go | Updates JSX transformer to use ECMA line positioning |
| internal/testutil/tsbaseline/*.go | Updates baseline test utilities to use ECMA line functions |
| internal/sourcemap/*.go | Renames LineInfo to ECMALineInfo and updates related functions |
| internal/scanner/scanner.go | Renames core line mapping functions with ECMA prefix |
| internal/project/*.go | Updates project files to use LSP line maps where appropriate |
| internal/ls/*.go | Renames LineMap to LSPLineMap for language server components |
| internal/format/*.go | Updates formatting code to use ECMA line functions |
| internal/printer/*.go | Updates printer utilities to use ECMA line positioning |
| internal/fourslash/*.go | Updates test framework to use LSP line maps |
| internal/diagnosticwriter/diagnosticwriter.go | Updates diagnostic output to use ECMA line positioning |
| internal/core/core.go | Renames core line computation functions with ECMA prefix |
| internal/compiler/program.go | Updates compiler to use ECMA line functions |
| internal/checker/grammarchecks.go | Updates grammar checking to use ECMA line positioning |
| internal/astnav/tokens_test.go | Updates test to use ECMA line map |
| internal/ast/ast.go | Renames SourceFile LineMap method to ECMALineMap |
jakebailey
approved these changes
Oct 1, 2025
|
|
||
| func GetIndentationForNode(n *ast.Node, ignoreActualIndentationRange *core.TextRange, sourceFile *ast.SourceFile, options *FormatCodeSettings) int { | ||
| startline, startpos := scanner.GetLineAndCharacterOfPosition(sourceFile, scanner.GetTokenPosOfNode(n, sourceFile, false)) | ||
| startline, startpos := scanner.GetECMALineAndCharacterOfPosition(sourceFile, scanner.GetTokenPosOfNode(n, sourceFile, false)) |
There was a problem hiding this comment.
The formatter using these instead of the client encoding is definitely spooky
jakebailey
reviewed
Oct 1, 2025
| lineMapMu sync.RWMutex | ||
| lineMap []core.TextPos | ||
| ecmaLineMapMu sync.RWMutex | ||
| ecmaLineMap []core.TextPos |
There was a problem hiding this comment.
Should we give []core.TextPos a name like ECMALineMap or does a change like that cause problems elsewhere?
sheetalkamat
approved these changes
Oct 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Renaming line map-related functions to make the distinction clear between ECMA and LSP lines.
ECMA line maps/line starts consider characters other than
\nand\r\nas line breaks (seestringutil.IsLineBreak), unlike LSP.This should help avoid future incorrect usages of those functions, and should make it easier to do #1578.