fix: only use optionalReplacementSpan if client supports InsertReplace #584
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
| @@ -63,7 +63,7 @@ export function asCompletionItem(entry: tsp.CompletionEntry, optionalReplacement | |||
| } | |||
|
|
|||
| let insertText = entry.insertText; | |||
| const replacementSpan = entry.replacementSpan || optionalReplacementSpan; | |||
| const replacementSpan = entry.replacementSpan || (features.completionInsertReplaceSupport ? optionalReplacementSpan : undefined); | |||
There was a problem hiding this comment.
I would suggest removing unnecessary code bellow:
- const replacementSpan = entry.replacementSpan || (features.completionInsertReplaceSupport ? optionalReplacementSpan : undefined);
+ const replacementSpan = entry.replacementSpan || optionalReplacementSpan;
...
- if (replacementRange) {
+ if (replacementRange && features.completionInsertReplaceSupport) {
if (!insertText) {
insertText = item.label;
}
- if (features.completionInsertReplaceSupport) {
const insertRange = lsp.Range.create(replacementRange.start, position);
item.textEdit = lsp.InsertReplaceEdit.create(insertText, insertRange, replacementRange);
- } else {
- item.textEdit = lsp.TextEdit.replace(replacementRange, insertText);
- }
} else {
item.insertText = insertText;
}There was a problem hiding this comment.
That doesn't sound right. The replacementRange can also come from the entry.replacementSpan itself in which case we want to create a replace TextEdit.
There was a problem hiding this comment.
True, you are right.
There was a problem hiding this comment.
Will try out this PR tomorrow.
|
Just to document that this PR addresses this comment #583 (comment) |
predragnikolic
approved these changes
Sep 12, 2022
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.
@predragnikolic