diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-05-21 14:10:00 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-05-21 14:10:00 +0100 |
commit | 3cba0dc26b707bebc1865671fd2c5139c1e1c537 (patch) | |
tree | 6d77f69e3299d4245ebae8987fc030348ae2ebb9 /editors/code/src/commands/index.ts | |
parent | 0c2b548b0b5712dcc2f9a4eead57e028b5461ba7 (diff) | |
parent | ff28c79ebd4c5a9a27542917940def9d4e66eea6 (diff) |
Merge #4552
4552: Transition OnEnter to WorkspaceSnippetEdit r=matklad a=matklad
This also changes our handiling of snippet edits on the client side.
`editor.insertSnippet` unfortunately forces indentation, which we
really don't want to have to deal with. So, let's just implement our
manual hacky way of dealing with a simple subset of snippets we
actually use in rust-analyzer
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code/src/commands/index.ts')
-rw-r--r-- | editors/code/src/commands/index.ts | 75 |
1 files changed, 48 insertions, 27 deletions
diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts index 0937b495c..e5ed77e32 100644 --- a/editors/code/src/commands/index.ts +++ b/editors/code/src/commands/index.ts | |||
@@ -53,36 +53,57 @@ export function selectAndApplySourceChange(ctx: Ctx): Cmd { | |||
53 | }; | 53 | }; |
54 | } | 54 | } |
55 | 55 | ||
56 | export function applySnippetWorkspaceEdit(_ctx: Ctx): Cmd { | 56 | export function applySnippetWorkspaceEditCommand(_ctx: Ctx): Cmd { |
57 | return async (edit: vscode.WorkspaceEdit) => { | 57 | return async (edit: vscode.WorkspaceEdit) => { |
58 | assert(edit.entries().length === 1, `bad ws edit: ${JSON.stringify(edit)}`); | 58 | await applySnippetWorkspaceEdit(edit); |
59 | const [uri, edits] = edit.entries()[0]; | 59 | }; |
60 | } | ||
61 | |||
62 | export async function applySnippetWorkspaceEdit(edit: vscode.WorkspaceEdit) { | ||
63 | assert(edit.entries().length === 1, `bad ws edit: ${JSON.stringify(edit)}`); | ||
64 | const [uri, edits] = edit.entries()[0]; | ||
60 | 65 | ||
61 | const editor = vscode.window.visibleTextEditors.find((it) => it.document.uri.toString() === uri.toString()); | 66 | const editor = vscode.window.visibleTextEditors.find((it) => it.document.uri.toString() === uri.toString()); |
62 | if (!editor) return; | 67 | if (!editor) return; |
63 | 68 | ||
64 | let editWithSnippet: vscode.TextEdit | undefined = undefined; | 69 | let selection: vscode.Selection | undefined = undefined; |
65 | let lineDelta = 0; | 70 | let lineDelta = 0; |
66 | await editor.edit((builder) => { | 71 | await editor.edit((builder) => { |
67 | for (const indel of edits) { | 72 | for (const indel of edits) { |
68 | const isSnippet = indel.newText.indexOf('$0') !== -1 || indel.newText.indexOf('${') !== -1; | 73 | const parsed = parseSnippet(indel.newText); |
69 | if (isSnippet) { | 74 | if (parsed) { |
70 | editWithSnippet = indel; | 75 | const [newText, [placeholderStart, placeholderLength]] = parsed; |
71 | } else { | 76 | const prefix = newText.substr(0, placeholderStart); |
72 | if (!editWithSnippet) { | 77 | const lastNewline = prefix.lastIndexOf('\n'); |
73 | lineDelta = (indel.newText.match(/\n/g) || []).length - (indel.range.end.line - indel.range.start.line); | 78 | |
74 | } | 79 | const startLine = indel.range.start.line + lineDelta + countLines(prefix); |
75 | builder.replace(indel.range, indel.newText); | 80 | const startColumn = lastNewline === -1 ? |
76 | } | 81 | indel.range.start.character + placeholderStart |
82 | : prefix.length - lastNewline - 1; | ||
83 | const endColumn = startColumn + placeholderLength; | ||
84 | selection = new vscode.Selection( | ||
85 | new vscode.Position(startLine, startColumn), | ||
86 | new vscode.Position(startLine, endColumn), | ||
87 | ); | ||
88 | builder.replace(indel.range, newText); | ||
89 | } else { | ||
90 | lineDelta = countLines(indel.newText) - (indel.range.end.line - indel.range.start.line); | ||
91 | builder.replace(indel.range, indel.newText); | ||
77 | } | 92 | } |
78 | }); | ||
79 | if (editWithSnippet) { | ||
80 | const snip = editWithSnippet as vscode.TextEdit; | ||
81 | const range = snip.range.with( | ||
82 | snip.range.start.with(snip.range.start.line + lineDelta), | ||
83 | snip.range.end.with(snip.range.end.line + lineDelta), | ||
84 | ); | ||
85 | await editor.insertSnippet(new vscode.SnippetString(snip.newText), range); | ||
86 | } | 93 | } |
87 | }; | 94 | }); |
95 | if (selection) editor.selection = selection; | ||
96 | } | ||
97 | |||
98 | function parseSnippet(snip: string): [string, [number, number]] | undefined { | ||
99 | const m = snip.match(/\$(0|\{0:([^}]*)\})/); | ||
100 | if (!m) return undefined; | ||
101 | const placeholder = m[2] ?? ""; | ||
102 | const range: [number, number] = [m.index!!, placeholder.length]; | ||
103 | const insert = snip.replace(m[0], placeholder); | ||
104 | return [insert, range]; | ||
105 | } | ||
106 | |||
107 | function countLines(text: string): number { | ||
108 | return (text.match(/\n/g) || []).length; | ||
88 | } | 109 | } |