fix: Object literal completions remove original

fixes #145

Author: zardoy

typescript/src/completions/objectLiteralCompletions.ts

@@ -9,7 +9,7 @@ export default (prior: ts.CompletionInfo): ts.CompletionEntry[] | void => {
     const enableMoreVariants = c('objectLiteralCompletions.moreVariants')
     const keepOriginal = c('objectLiteralCompletions.keepOriginal')
     if (!preferences.includeCompletionsWithObjectLiteralMethodSnippets && !enableMoreVariants) return
-    // plans to make it hihgly configurable! e.g. if user wants to make some subtype leading (e.g. from [] | {})
+    // plans to make it highly configurable! e.g. if user wants to make some subtype leading (e.g. from [] | {})
     if (ts.isIdentifier(node)) node = node.parent
     if (ts.isShorthandPropertyAssignment(node)) node = node.parent
     const nextChar = node.getSourceFile().getFullText()[position]
@@ -22,8 +22,8 @@ export default (prior: ts.CompletionInfo): ts.CompletionEntry[] | void => {
         if (!objType) return
         oldProperties = getAllPropertiesOfType(objType, typeChecker)
     }
-    const clonedEntries = [...entries]
-    for (const entry of clonedEntries) {
+    const nonObjectLiteralEntries = entries.filter(entry => !isObjectLiteralMethodSnippet(entry))
+    for (const entry of nonObjectLiteralEntries) {
         let type: ts.Type | undefined
         if (!isTs5()) {
             const property = oldProperties!.find(property => property.name === entry.name)

typescript/test/completions.spec.ts

@@ -712,6 +712,29 @@ test('Object Literal Completions', () => {
     expect(pos4.filter(x => x.insertText?.includes(': '))).toEqual([])
 })
 
+test.only('Object Literal Completions with keepOriginal: remove & builtin method snippets', () => {
+    overrideSettings({
+        'objectLiteralCompletions.keepOriginal': 'remove',
+    })
+    const { completion } = fourslashLikeTester(/* ts */ `
+        interface Options {
+            a: {}
+            onA()
+        }
+        const options: Options = {
+            /*1*/
+        }
+    `)
+    completion(1, {
+        exact: {
+            insertTexts: ['a: {\n\t$1\n},$0', 'onA() {\n    $0\n},'],
+            all: {
+                isSnippet: true,
+            },
+        },
+    })
+})
+
 test('Extract to type / interface name inference', () => {
     fourslashLikeTester(/* ts */ `
         const foo: { bar: string; } = { bar: 'baz' }

typescript/test/testing.ts

@@ -5,7 +5,8 @@ import { defaultConfigFunc, entrypoint, sharedLanguageService, settingsOverride,
 
 interface CompletionPartMatcher {
     names?: string[]
-    all?: Pick<ts.CompletionEntry, 'kind' | 'isSnippet'>
+    insertTexts?: string[]
+    all?: Partial<Pick<ts.CompletionEntry, 'kind' | 'isSnippet'>>
 }
 
 interface CompletionMatcher {
@@ -31,6 +32,10 @@ export const getCompletionsAtPosition = (pos: number, { fileName = entrypoint, s
         pos,
         {
             includeCompletionsWithInsertText: true,
+            includeCompletionsWithObjectLiteralMethodSnippets: true,
+            includeCompletionsWithSnippetText: true,
+            includeCompletionsWithClassMemberSnippets: true,
+            useLabelDetailsInCompletionEntries: true,
         },
         defaultConfigFunc,
         languageService,
@@ -85,10 +90,16 @@ export const fourslashLikeTester = (contents: string, fileName = entrypoint) =>
                 const message = ` at marker ${mark}`
                 const { exact, includes, excludes } = matcher
                 if (exact) {
-                    const { names, all } = exact
+                    const { names, all, insertTexts } = exact
                     if (names) {
                         expect(result?.entryNames, message).toEqual(names)
                     }
+                    if (insertTexts) {
+                        expect(
+                            result.entries.map(entry => entry.insertText),
+                            message,
+                        ).toEqual(insertTexts)
+                    }
                     if (all) {
                         for (const entry of result.entries) {
                             expect(entry, entry.name + message).toContain(all)