development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

The replaced text does only need to be a prefix of the insert text after removing all leading whitespace.

Browse source
This commit is contained in:
Henning Dieterichs 2021-05-31 18:05:45 +02:00
parent 67a8548712
commit 3a259a7a6a
No known key found for this signature in database
GPG key ID: 771381EFFDB9EC06
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/vs/editor/contrib/inlineCompletions/inlineCompletionsModel.ts
View file

@ -429,13 +429,24 @@ export interface NormalizedInlineCompletion extends InlineCompletion {
}
export function inlineCompletionToGhostText(inlineCompletion: NormalizedInlineCompletion, textModel: ITextModel): GhostText | undefined {
// This is a single line string
const valueToBeReplaced = textModel.getValueInRange(inlineCompletion.range);
if (!inlineCompletion.text.startsWith(valueToBeReplaced)) {
// valueToBeReplaced === ws1 + valueToBeReplacedTrimmed
const valueToBeReplacedTrimmed = valueToBeReplaced.trimLeft();
// inlineCompletion.text === ws2 + insertTextTrimmed
const insertTextTrimmed = inlineCompletion.text.trimLeft();
if (!insertTextTrimmed.startsWith(valueToBeReplacedTrimmed)) {
// if ws1 === ws2, then inlineCompletion.text does not start with valueToBeReplaced
return undefined;
}
const position = inlineCompletion.range.getEndPosition();
const lines = strings.splitLines(inlineCompletion.text.substr(valueToBeReplaced.length));
const remainingInsertText = insertTextTrimmed.substr(valueToBeReplacedTrimmed.length);
// if ws1 === ws2, then
// remainingInsertText === (ws2 + insertTextTrimmed).substr(ws1 + valueToBeReplacedTrimmed.length);
// === inlineCompletion.text.substr(valueToBeReplaced.length)
const lines = strings.splitLines(remainingInsertText);
if (lines.length > 1 && textModel.getLineMaxColumn(position.lineNumber) !== position.column) {
// Such ghost text is not supported.
@ -448,8 +459,7 @@ export function inlineCompletionToGhostText(inlineCompletion: NormalizedInlineCo
};
}
export interface LiveInlineCompletion extends InlineCompletion {
range: Range;
export interface LiveInlineCompletion extends NormalizedInlineCompletion {
sourceProvider: InlineCompletionsProvider;
sourceInlineCompletion: InlineCompletion;
sourceInlineCompletions: InlineCompletions;
@ -510,6 +520,10 @@ async function provideInlineCompletions(
sourceInlineCompletions: completions,
sourceInlineCompletion: item
}))) {
if (item.range.startLineNumber !== item.range.endLineNumber) {
// Ignore invalid ranges.
continue;
}
itemsByHash.set(JSON.stringify({ text: item.text, range: item.range }), item);
}
}