kiteco/vscode-plugin
1
1
Fork 0
mirror of https://github.com/kiteco/vscode-plugin.git synced 2024-09-11 16:08:10 +03:00
Code Issues Projects Releases Wiki Activity

Fix handling of $ characters in a snippet text (#384)

Browse Source 
* Fix handling of $ characters in a snippet text

* Fine tune regex
This commit is contained in:
edzkite 2021-05-21 13:26:11 -07:00 committed by GitHub
parent da3938ae00
commit 2059e23caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/completion.js
View File

@ -78,7 +78,6 @@ const processCompletion = (
i
) => {
const item = new CompletionItem(displayPrefix + c.display);
item.insertText = c.snippet.text;
const start = document.positionAt(c.replace.begin);
const end = document.positionAt(c.replace.end);
@ -99,26 +98,31 @@ const processCompletion = (
item.detail = c.hint + KITE_BRANDING;
item.kind = kindForHint(c.hint);
if (c.snippet.placeholders.length > 0) {
item.insertText = c.snippet.text;
const placeholders = c.snippet.placeholders;
if (Array.isArray(placeholders) && placeholders.length) {
let snippetText = c.snippet.text;
var offset = 0;
let i = 0;
for (i = 0; i < c.snippet.placeholders.length; i++) {
let placeholder = c.snippet.placeholders[i];
placeholder.begin += offset;
placeholder.end += offset;
item.insertText =
item.insertText.slice(0, placeholder.begin) +
snippetText =
snippetText.slice(0, placeholder.begin) +
"${" +
(i + 1).toString() +
":" +
item.insertText.slice(placeholder.begin, placeholder.end) +
snippetText.slice(placeholder.begin, placeholder.end) +
"}" +
item.insertText.slice(placeholder.end);
snippetText.slice(placeholder.end);
offset += 5;
}
// Sanitize snippet text by replacing all $ with \\$ except those in the form of ${x:...}
snippetText = snippetText.replaceAll(/\$(?!{\d+:.*})/g, "\\$");
// Add closing tab stop
item.insertText += "$0";
item.insertText = new SnippetString(item.insertText);
snippetText += "$0";
item.insertText = new SnippetString(snippetText);
}
item.command = {