fix(typescript): fix inlay hints mapping for large chunks of source code mapped verbatim to generated code. #236
Conversation
This file contains 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
|
commit: @volar/eslint
@volar/jsdelivr
@volar/kit
@volar/language-core
@volar/language-server
@volar/language-service
@volar/monaco
@volar/source-map
@volar/test-utils
@volar/typescript
@volar/vscode
|
piotrtomiak
commented
Aug 30, 2024
| @@ -936,14 +936,29 @@ function provideInlayHints(language: Language<string>, provideInlayHints: ts.Lan | |||
| if (serviceScript) { | |||
| let start: number | undefined; | |||
| let end: number | undefined; | |||
| const map = language.maps.get(serviceScript.code, targetScript); | |||
| const map = language.maps.get(serviceScript.code, sourceScript); | |||
There was a problem hiding this comment.
First of all maps were taken for the wrong script. It should be a source script to have correct mappings from the template to generated code
| if (mappingStart >= span.start && mappingStart <= span.start + span.length) { | ||
| genStart = mapping.generatedOffsets[0]; | ||
| genEnd = mapping.generatedOffsets[mapping.generatedOffsets.length - 1] | ||
| + (mapping.generatedLengths ?? mapping.lengths)[mapping.generatedOffsets.length - 1]; |
There was a problem hiding this comment.
The end offset should include the whole length of the generated code.
| + (mapping.generatedLengths ?? mapping.lengths)[mapping.generatedOffsets.length - 1]; | ||
| } else if (mappingStart < span.start && span.start < mappingStart + mapping.lengths[0] | ||
| && mapping.sourceOffsets.length == 1 | ||
| && (!mapping.generatedLengths || mapping.generatedLengths[0] === mapping.lengths[0]) |
There was a problem hiding this comment.
My Angular VirtualCode has large pieces of code copied verbatim from the original file. This condition ensures that it is correctly handled and not ignored.
piotrtomiak
force-pushed
the
inlay-hints-fix
branch
from
ffac5f7
to
e478c41
Compare
…ode mapped verbatim to generated code.
piotrtomiak
force-pushed
the
inlay-hints-fix
branch
from
e478c41
to
588dcea
Compare
|
Since I had difficulty testing it, it took me some time to understand. Thank you for your PR! Are you planning to make the same changes to getEncodedSemanticClassifications? |
|
@johnsoncodehk - I haven't planned since we are not using these currently, so I would have hard time testing it. Thanks for merging the PR! |
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.
I've started working on support of inlay hints for Angular templates and I've noticed some issues.