fix: fix jsx attribute shortcut replace range

fixes #195
zardoy · Apr 21, 2024 · 23cf01a · 23cf01a
1 parent 5e20047
commit 23cf01a
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/typescript/src/completions/jsxAttributes.ts b/typescript/src/completions/jsxAttributes.ts
@@ -11,6 +11,7 @@ export default (
     sourceFile: ts.SourceFile,
     jsxCompletionsMap: Configuration['jsxCompletionsMap'],
 ): ts.CompletionEntry[] => {
+    const originalNode = node
     // ++ patch with jsxCompletionsMap
     // -- don't
     // <div| - identifier, not attribute --
@@ -78,13 +79,24 @@ export default (
         const enableJsxAttributesShortcuts = sharedCompletionContext.c('jsxAttributeShortcutCompletions.enable')
         if (enableJsxAttributesShortcuts !== 'disable') {
             const locals = collectLocalSymbols(node, sharedCompletionContext.typeChecker)
+            let attrib = originalNode.parent as ts.JsxAttribute | undefined
+            if (!ts.isJsxAttribute(attrib!)) {
+                attrib = undefined
+            }
             entries = entries.flatMap(entry => {
                 if (locals.includes(entry.name)) {
                     const insertText = `${entry.name}={${entry.name}}`
-                    const additionalSuggestions = {
+                    const pos = attrib ? attrib.end - attrib.getWidth() : 0
+                    const additionalSuggestions: ts.CompletionEntry = {
                         ...entry,
                         name: insertText,
                         insertText,
+                        replacementSpan: attrib
+                            ? {
+                                  start: pos,
+                                  length: attrib.end - pos,
+                              }
+                            : undefined,
                     }
                     return enableJsxAttributesShortcuts === 'after' ? [entry, additionalSuggestions] : [additionalSuggestions, entry]
                 }