fix: methodSnippetsInsertText before . sorting workaround

fixes #161

Author: zardoy

src/extension.ts

@@ -1,10 +1,9 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
 import * as vscode from 'vscode'
 import { defaultJsSupersetLangs } from '@zardoy/vscode-utils/build/langs'
-import { Settings, extensionCtx, getExtensionSetting, getExtensionSettingId, registerExtensionCommand } from 'vscode-framework'
+import { extensionCtx, getExtensionSetting, getExtensionSettingId } from 'vscode-framework'
 import { pickObj } from '@zardoy/utils'
 import { watchExtensionSettings } from '@zardoy/vscode-utils/build/settings'
-import { ConditionalPick } from 'type-fest'
 import webImports from './webImports'
 import { sendCommand } from './sendCommand'
 import { registerEmmet } from './emmet'
@@ -27,13 +26,21 @@ export const activateTsPlugin = (tsApi: { configurePlugin; onCompletionAccepted
     isActivated = true
     let webWaitingForConfigSync = false
 
+    const getResolvedConfig = () => {
+        const configuration = vscode.workspace.getConfiguration()
+        const config: any = {
+            ...configuration.get(process.env.IDS_PREFIX!),
+            editorSuggestInsertModeReplace: configuration.get('editor.suggest.insertMode') === 'replace',
+        }
+        mergeSettingsFromScopes(config, 'typescript', extensionCtx.extension.packageJSON)
+        return config
+    }
+
     const syncConfig = () => {
         if (!tsApi) return
         console.log('sending configure request for typescript-essential-plugins')
-        const config: any = { ...vscode.workspace.getConfiguration().get(process.env.IDS_PREFIX!) }
         // todo implement language-specific settings
-        mergeSettingsFromScopes(config, 'typescript', extensionCtx.extension.packageJSON)
-
+        const config = getResolvedConfig()
         tsApi.configurePlugin('typescript-essential-plugins', config)
 
         if (process.env.PLATFORM === 'node') {
@@ -50,7 +57,7 @@ export const activateTsPlugin = (tsApi: { configurePlugin; onCompletionAccepted
     }
 
     vscode.workspace.onDidChangeConfiguration(async ({ affectsConfiguration }) => {
-        if (affectsConfiguration(process.env.IDS_PREFIX!)) {
+        if (affectsConfiguration(process.env.IDS_PREFIX!) || affectsConfiguration('editor.suggest.insertMode')) {
             syncConfig()
             if (
                 process.env.PLATFORM === 'node' &&
@@ -72,7 +79,7 @@ export const activateTsPlugin = (tsApi: { configurePlugin; onCompletionAccepted
             if (!activeTextEditor || !vscode.languages.match(defaultJsSupersetLangs, activeTextEditor.document)) return
             if (!webWaitingForConfigSync) return
             // webWaitingForConfigSync = false
-            const config = vscode.workspace.getConfiguration().get(process.env.IDS_PREFIX!)
+            const config = getResolvedConfig()
             void sendCommand(`updateConfig${JSON.stringify(config)}` as any)
         }
 

typescript/src/completions/functionCompletions.ts

@@ -1,13 +1,15 @@
 import { oneOf } from '@zardoy/utils'
 import constructMethodSnippet from '../constructMethodSnippet'
-import { insertTextAfterEntry } from '../utils'
+import { insertTextAfterEntry, wordRangeAtPos } from '../utils'
 import { sharedCompletionContext } from './sharedContext'
 
 export default (entries: ts.CompletionEntry[]) => {
-    const { languageService, c, sourceFile, position } = sharedCompletionContext
+    const { languageService, c, sourceFile, position, prior } = sharedCompletionContext
 
     const methodSnippetInsertTextMode = c('methodSnippetsInsertText')
-    const nextChar = sourceFile.getFullText().slice(position, position + 1)
+    const fullText = sourceFile.getFullText()
+    const nextChar = fullText.slice(position, position + 1)
+    const prevChar = fullText.slice(position - 1, position)
     const isMethodSnippetInsertTextModeEnabled = methodSnippetInsertTextMode !== 'disable'
 
     const enableResolvingInsertText = !['(', '.', '`'].includes(nextChar) && c('enableMethodSnippets') && isMethodSnippetInsertTextModeEnabled
@@ -47,13 +49,21 @@ export default (entries: ts.CompletionEntry[]) => {
                 if (!methodSnippet || resolveData.isAmbiguous) return
                 const originalText = entry.insertText ?? entry.name
                 const insertTextSnippetAdd = `(${methodSnippet.map((x, i) => `$\{${i + 1}:${x}}`).join(', ')})`
+                // https://github.com/zardoy/typescript-vscode-plugins/issues/161
+                const beforeDotWorkaround = prior.isMemberCompletion && prevChar === '.'
                 return {
                     ...entry,
-                    insertText: insertTextAfterEntry(originalText, insertTextSnippetAdd),
+                    insertText: (beforeDotWorkaround ? '.' : '') + insertTextAfterEntry(originalText, insertTextSnippetAdd),
                     labelDetails: {
                         detail: `(${methodSnippet.join(', ')})`,
                         description: ts.displayPartsToString(entry.sourceDisplay),
                     },
+                    replacementSpan: beforeDotWorkaround
+                        ? {
+                              start: position - 1,
+                              length: (c('editorSuggestInsertModeReplace') ? wordRangeAtPos(fullText, position).length : 0) + 1,
+                          }
+                        : undefined,
                     kind: ts.ScriptElementKind.functionElement,
                     isSnippet: true,
                 }

typescript/src/types.ts

@@ -3,7 +3,7 @@ import { ConditionalPick } from 'type-fest'
 //@ts-expect-error
 import type { Configuration } from '../../src/configurationType'
 // eslint-disable-next-line @typescript-eslint/no-redeclare
-export type Configuration = Configuration
+export type Configuration = Configuration & { editorSuggestInsertModeReplace: boolean }
 export type GetConfig = <T extends keyof Configuration>(key: T) => Configuration[T]
 export type LanguageServiceMethodWithConfig<T extends keyof ConditionalPick<ts.LanguageService, (...args) => any>> = (
     c: GetConfig,

typescript/src/volarConfig.ts

@@ -67,6 +67,7 @@ const plugin: (...args: Parameters<import('@vue/language-service').Service>) =>
 
     const getResolvedUserConfig = async () => {
         const regularConfig = await configurationHost.getConfiguration!<any>('tsEssentialPlugins')
+        const editorSuggestInsertModeReplace = (await configurationHost.getConfiguration!<any>('editor.suggest.insertMode')) === 'replace'
         const _vueSpecificConfig = (await configurationHost.getConfiguration!<any>('[vue]')) || {}
 
         const vueSpecificConfig = Object.fromEntries(
@@ -76,7 +77,7 @@ const plugin: (...args: Parameters<import('@vue/language-service').Service>) =>
                 ),
             ),
         )
-        const config: Configuration = mergeAndPatchConfig(regularConfig, vueSpecificConfig)
+        const config: Configuration = { ...mergeAndPatchConfig(regularConfig, vueSpecificConfig), editorSuggestInsertModeReplace }
         return config
     }