language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-22 03:14:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix handling of multi-cursor snippets

Browse source 
This allows one snippet per TextEdit, multiple in the same TextEdit
are still broken
This commit is contained in:
Jonas Schievink 2021-03-27 18:50:55 +01:00
parent e39979aa91
commit 201fbac8a9
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
editors/code/src/snippets.ts
View file

@ -29,7 +29,7 @@ async function editorFromUri(uri: vscode.Uri): Promise<vscode.TextEditor | undef
} }
export async function applySnippetTextEdits(editor: vscode.TextEditor, edits: vscode.TextEdit[]) { export async function applySnippetTextEdits(editor: vscode.TextEditor, edits: vscode.TextEdit[]) {
let selection: vscode.Selection | undefined = undefined; let selections: vscode.Selection[] = [];
let lineDelta = 0; let lineDelta = 0;
await editor.edit((builder) => { await editor.edit((builder) => {
for (const indel of edits) { for (const indel of edits) {
@ -44,18 +44,18 @@ export async function applySnippetTextEdits(editor: vscode.TextEditor, edits: vs
indel.range.start.character + placeholderStart indel.range.start.character + placeholderStart
: prefix.length - lastNewline - 1; : prefix.length - lastNewline - 1;
const endColumn = startColumn + placeholderLength; const endColumn = startColumn + placeholderLength;
selection = new vscode.Selection( selections.push(new vscode.Selection(
new vscode.Position(startLine, startColumn), new vscode.Position(startLine, startColumn),
new vscode.Position(startLine, endColumn), new vscode.Position(startLine, endColumn),
); ));
builder.replace(indel.range, newText); builder.replace(indel.range, newText);
} else { } else {
lineDelta = countLines(indel.newText) - (indel.range.end.line - indel.range.start.line);
builder.replace(indel.range, indel.newText); builder.replace(indel.range, indel.newText);
} }
lineDelta = countLines(indel.newText) - (indel.range.end.line - indel.range.start.line);
} }
}); });
if (selection) editor.selection = selection; if (selections.length > 0) editor.selections = selections;
} }
function parseSnippet(snip: string): [string, [number, number]] | undefined { function parseSnippet(snip: string): [string, [number, number]] | undefined {