feat: include fix for builtin typescript.suggest.completeFunctionCalls in some positions out of the box

fix: don't insert method snippet in some positions, inclusing const assigning

Author: zardoy

typescript/src/completionsAtPosition.ts

@@ -4,6 +4,7 @@ import * as emmet from '@vscode/emmet-helper'
 import isInBannedPosition from './isInBannedPosition'
 import { GetConfig } from './types'
 import { findChildContainingPosition } from './utils'
+import { isGoodPositionBuiltinMethodCompletion } from './isGootPositionMethodCompletion'
 
 export type PrevCompletionMap = Record<string, { originalName?: string; documentationOverride?: string | tslib.SymbolDisplayPart[] }>
 
@@ -225,6 +226,11 @@ export const getCompletionsAtPosition = (
         if (rule.patch?.insertText) suggestion.isSnippet = true
     }
 
+    // prevent vscode-builtin wrong insertText with methods snippets enabled
+    if (!isGoodPositionBuiltinMethodCompletion(ts, sourceFile, position)) {
+        prior.entries = prior.entries.map(item => ({ ...item, insertText: item.insertText ?? item.name, isSnippet: true }))
+    }
+
     if (c('correctSorting.enable')) prior.entries = prior.entries.map((entry, index) => ({ ...entry, sortText: `${entry.sortText ?? ''}${index}` }))
 
     // console.log('signatureHelp', JSON.stringify(info.languageService.getSignatureHelpItems(fileName, position, {})))

typescript/src/index.ts

@@ -6,9 +6,9 @@ import type { Configuration } from '../../src/configurationType'
 import _ from 'lodash'
 import { GetConfig } from './types'
 import { getCompletionsAtPosition, PrevCompletionMap } from './completionsAtPosition'
-import { CompletionEntry } from 'typescript/lib/tsserverlibrary'
 import { getParameterListParts } from './completionGetMethodParameters'
 import { oneOf } from '@zardoy/utils'
+import { isGoodPositionMethodCompletion } from './isGootPositionMethodCompletion'
 
 const thisPluginMarker = Symbol('__essentialPluginsMarker__')
 
@@ -87,8 +87,9 @@ export = function ({ typescript }: { typescript: typeof import('typescript/lib/t
                 )
                 if (!prior) return
                 if (c('enableMethodSnippets') && oneOf(prior.kind as string, ts.ScriptElementKind.constElement, 'property')) {
+                    const goodPosition = isGoodPositionMethodCompletion(ts, fileName, sourceFile, position, info.languageService)
                     const punctuationIndex = prior.displayParts.findIndex(({ kind }) => kind === 'punctuation')
-                    if (punctuationIndex !== 1) {
+                    if (goodPosition && punctuationIndex !== 1) {
                         const isParsableMethod = prior.displayParts
                             // next is space
                             .slice(punctuationIndex + 2)

typescript/src/isGootPositionMethodCompletion.ts

@@ -0,0 +1,32 @@
+import type tslib from 'typescript/lib/tsserverlibrary'
+import { findChildContainingPosition } from './utils'
+
+export const isGoodPositionBuiltinMethodCompletion = (ts: typeof tslib, sourceFile: tslib.SourceFile, position: number) => {
+    const importClauseCandidate = findChildContainingPosition(ts, sourceFile, position, 2)
+    if (importClauseCandidate?.kind === 266) return false
+    const currentNode = findChildContainingPosition(ts, sourceFile, position)
+    // const obj = { method() {}, arrow: () => {} }
+    // type A = typeof obj["|"]
+    if (currentNode && ts.isStringLiteralLike(currentNode)) return false
+    return true
+}
+
+export const isGoodPositionMethodCompletion = (
+    ts: typeof tslib,
+    fileName: string,
+    sourceFile: tslib.SourceFile,
+    position: number,
+    languageService: tslib.LanguageService,
+) => {
+    if (!isGoodPositionBuiltinMethodCompletion(ts, sourceFile, position)) return false
+    const { kind } = languageService.getQuickInfoAtPosition(fileName, position) ?? {}
+    switch (kind) {
+        case 'var':
+        case 'let':
+        case 'const':
+        case 'alias':
+            return false
+    }
+    // TODO check for brace here
+    return true
+}

typescript/src/utils.ts

@@ -4,9 +4,14 @@ export function findChildContainingPosition(
     typescript: typeof import('typescript/lib/tsserverlibrary'),
     sourceFile: tslib.SourceFile,
     position: number,
+    maxDepth?: number,
 ): tslib.Node | undefined {
+    let currentDepth = 0
     function find(node: ts.Node): ts.Node | undefined {
-        if (position >= node.getStart() && position < node.getEnd()) return typescript.forEachChild(node, find) || node
+        if (position >= node.getStart() && position < node.getEnd()) {
+            if (++currentDepth === maxDepth) return node
+            return typescript.forEachChild(node, find) || node
+        }
 
         return
     }