🐛 Fix double-escaping completion items in strings (#1686)

SpyglassMC · Dec 27, 2024 · 4ebdba8 · 4ebdba8
1 parent b3e8fed
commit 4ebdba8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/core/src/processor/completer/Completer.ts b/packages/core/src/processor/completer/Completer.ts
@@ -92,6 +92,13 @@ export namespace CompletionItem {
 	export function escape(textToInsert: string): string {
 		return textToInsert.replace(/([\\$}])/g, '\\$1')
 	}
+
+	/**
+	 * Un-escape `$`, `\`, and `}` in `textToInsert`
+	 */
+	export function unescape(textToInsert: string): string {
+		return textToInsert.replace(/\\([\\$}])/g, '$1')
+	}
 }
 
 export class InsertTextBuilder {

diff --git a/packages/core/src/processor/completer/builtin.ts b/packages/core/src/processor/completer/builtin.ts
@@ -283,7 +283,10 @@ export function escapeString(value: string, quote?: Quote) {
 	if (!quote) {
 		return value
 	}
-	return value.replaceAll('\\', '\\\\').replaceAll(quote, '\\"')
+	// Un-escape and then re-escape completion
+	value = CompletionItem.unescape(value)
+	value = value.replaceAll('\\', '\\\\').replaceAll(quote, '\\"')
+	return CompletionItem.escape(value)
 }
 
 export const symbol: Completer<SymbolBaseNode> = (node, ctx) => {