fix(insert-name-of-completion): insert while with correct range by default

Author: zardoy

src/specialCommands.ts

@@ -240,13 +240,18 @@ export default () => {
         await vscode.commands.executeCommand(preview ? 'acceptRenameInputWithPreview' : 'acceptRenameInput')
     })
 
-    registerExtensionCommand('insertNameOfCompletion', async () => {
+    registerExtensionCommand('insertNameOfCompletion', async (_, { insertMode } = {}) => {
         const editor = vscode.window.activeTextEditor
         if (!editor) return
         if (!getExtensionSetting('experimental.enableInsertNameOfSuggestionFix')) {
             const result = await sendCommand<RequestResponseTypes['getLastResolvedCompletion']>('getLastResolvedCompletion')
             if (!result) return
-            await editor.insertSnippet(new vscode.SnippetString().appendText(result.name))
+            const position = editor.selection.active
+            const range = result.range ? tsRangeToVscode(editor.document, result.range) : editor.document.getWordRangeAtPosition(position)
+            await editor.insertSnippet(
+                new vscode.SnippetString().appendText(result.name),
+                (insertMode || vscode.workspace.getConfiguration().get('editor.suggest.insertMode')) === 'replace' ? range : range?.with(undefined, position),
+            )
             return
         }
 

typescript/src/completionEntryDetails.ts

@@ -16,7 +16,7 @@ export default function completionEntryDetails(
     { enableMethodCompletion, completionsSymbolMap }: PrevCompletionsAdditionalData,
 ): ts.CompletionEntryDetails | undefined {
     const [fileName, position, entryName, formatOptions, source, preferences, data] = inputArgs
-    lastResolvedCompletion.value = { name: entryName }
+    lastResolvedCompletion.value = { name: entryName, range: prevCompletionsMap[entryName]?.range }
     const program = languageService.getProgram()
     const sourceFile = program?.getSourceFile(fileName)
     if (!program || !sourceFile) return

typescript/src/completionsAtPosition.ts

@@ -40,6 +40,7 @@ export type PrevCompletionMap = Record<
         documentationOverride?: string | ts.SymbolDisplayPart[]
         detailPrepend?: string
         documentationAppend?: string
+        range?: [number, number]
         // textChanges?: ts.TextChange[]
     }
 >
@@ -48,7 +49,7 @@ export type PrevCompletionsAdditionalData = {
     completionsSymbolMap: Map</*entryName*/ string, Array<{ symbol: ts.Symbol; source?: string }>>
 }
 
-type GetCompletionAtPositionReturnType = {
+export type GetCompletionAtPositionReturnType = {
     completions: ts.CompletionInfo
     /** Let default getCompletionEntryDetails to know original name or let add documentation from here */
     prevCompletionsMap: PrevCompletionMap
@@ -267,6 +268,13 @@ export const getCompletionsAtPosition = (
             prior.entries = prior.entries.filter(({ name, kind }) => kind === ts.ScriptElementKind.warning || !name.startsWith('__'))
         }
     }
+    if (isVueFile && exactNode && ts.isArrayLiteralExpression(ts.isIdentifier(exactNode) ? exactNode.parent : exactNode)) {
+        const type = languageService
+            .getProgram()!
+            .getTypeChecker()!
+            .getTypeOfSymbol(prior.entries.find(e => e.name === 'Logo')?.symbol!)
+        console.log(type)
+    }
     // #endregion
 
     addSourceDefinition(prior.entries)
@@ -382,6 +390,13 @@ export const getCompletionsAtPosition = (
         }
     }
 
+    for (const entry of prior.entries) {
+        const { replacementSpan } = entry
+        if (!replacementSpan) continue
+        prevCompletionsMap[entry.name] ??= {}
+        prevCompletionsMap[entry.name]!.range = [replacementSpan.start, ts.textSpanEnd(replacementSpan)]
+    }
+
     // Otherwise may crash Volar
     prior.entries = prior.entries.map(entry => ({
         ...entry,

typescript/src/ipcTypes.ts

@@ -80,6 +80,7 @@ export type RequestResponseTypes = {
     getExtendedCodeActionEdits: ApplyExtendedCodeActionResult
     getLastResolvedCompletion: {
         name: string
+        range?: TsRange
     }
 }