fix don't add space to some keywords in types

Author: zardoy

typescript/src/completionsAtPosition.ts

@@ -3,7 +3,7 @@ import type tslib from 'typescript/lib/tsserverlibrary'
 // import * as emmet from '@vscode/emmet-helper'
 import isInBannedPosition from './completions/isInBannedPosition'
 import { GetConfig } from './types'
-import { findChildContainingPosition } from './utils'
+import { findChildContainingExactPosition, findChildContainingPosition } from './utils'
 import indexSignatureAccessCompletions from './completions/indexSignatureAccess'
 import fixPropertiesSorting from './completions/fixPropertiesSorting'
 import { isGoodPositionBuiltinMethodCompletion } from './completions/isGoodPositionMethodCompletion'
@@ -49,7 +49,7 @@ export const getCompletionsAtPosition = (
     /** node that is one character behind
      * useful as in most cases we work with node that is behind the cursor */
     const leftNode = findChildContainingPosition(ts, sourceFile, position - 1)
-    const tokenAtPosition = tsFull.getTokenAtPosition(sourceFile as any, position) as ts.Node
+    const exactNode = findChildContainingExactPosition(sourceFile, position)
     if (['.jsx', '.tsx'].some(ext => fileName.endsWith(ext))) {
         // #region JSX tag improvements
         if (node) {
@@ -160,7 +160,7 @@ export const getCompletionsAtPosition = (
         })
 
     if (c('suggestions.keywordsInsertText') === 'space') {
-        prior.entries = keywordsSpace(prior.entries, scriptSnapshot, position, tokenAtPosition)
+        prior.entries = keywordsSpace(prior.entries, scriptSnapshot, position, exactNode)
     }
 
     if (leftNode && c('switchExcludeCoveredCases')) prior.entries = switchCaseExcludeCovered(prior.entries, position, sourceFile, leftNode) ?? prior.entries

typescript/src/utils.ts

@@ -11,6 +11,17 @@ export function findChildContainingPosition(typescript: typeof ts, sourceFile: t
     return find(sourceFile)
 }
 
+export function findChildContainingExactPosition(sourceFile: ts.SourceFile, position: number): ts.Node | undefined {
+    function find(node: ts.Node): ts.Node | undefined {
+        if (position >= node.getStart() && position <= node.getEnd()) {
+            return ts.forEachChild(node, find) || node
+        }
+
+        return
+    }
+    return find(sourceFile)
+}
+
 export function findChildContainingPositionMaxDepth(sourceFile: ts.SourceFile, position: number, maxDepth?: number): ts.Node | undefined {
     let currentDepth = 0
     function find(node: ts.Node): ts.Node | undefined {
@@ -114,3 +125,21 @@ export const isWeb = () => {
         return true
     }
 }
+
+export function addObjectMethodResultInterceptors<T extends Record<string, any>>(
+    object: T,
+    interceptors: Partial<{
+        [K in keyof Required<T> as T[K] extends (...args: any[]) => any ? K : never]: (result: ReturnType<T[K]>, ...args: Parameters<T[K]>) => ReturnType<T[K]>
+    }>,
+) {
+    for (const key of Object.keys(interceptors)) {
+        const x = object[key]!
+        const callback = interceptors[key]!
+        if (typeof x !== 'function') continue
+        //@ts-ignore
+        object[key] = (...args: any) => {
+            const result = x.apply(object, args)
+            return callback(result, ...args)
+        }
+    }
+}