fix: objectLiteralCompletions was completing after property access

Author: zardoy

typescript/src/completions/objectLiteralCompletions.ts

@@ -14,63 +14,63 @@ export default (
         // plans to make it hihgly 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
+        if (!ts.isObjectLiteralExpression(node)) return
+
         entries = [...entries]
-        if (ts.isObjectLiteralExpression(node)) {
-            const typeChecker = languageService.getProgram()!.getTypeChecker()!
-            const objType = typeChecker.getContextualType(node)
-            if (!objType) return
-            // its doesn't return all actual properties in some cases e.g. it would be more correct to use symbols from entries, but there is a block from TS
-            const properties = objType.getProperties()
-            for (const property of properties) {
-                const entry = entries.find(({ name }) => name === property.name)
-                if (!entry) continue
-                const type = typeChecker.getTypeOfSymbolAtLocation(property, node)
-                if (!type) continue
-                if (isMethodCompletionCall(type, typeChecker)) {
-                    if (['above', 'remove'].includes(keepOriginal) && preferences.includeCompletionsWithObjectLiteralMethodSnippets) {
-                        const methodEntryIndex = entries.findIndex(e => e.name === entry.name && isObjectLiteralMethodSnippet(e))
-                        const methodEntry = entries[methodEntryIndex]
-                        if (methodEntry) {
-                            entries.splice(methodEntryIndex, 1)
-                            entries.splice(entries.indexOf(entry) + (keepOriginal === 'below' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
-                                ...methodEntry,
-                                // let correctSorting.enable sort it
-                                sortText: entry.sortText,
-                            })
-                        }
+        const typeChecker = languageService.getProgram()!.getTypeChecker()!
+        const objType = typeChecker.getContextualType(node)
+        if (!objType) return
+        // its doesn't return all actual properties in some cases e.g. it would be more correct to use symbols from entries, but there is a block from TS
+        const properties = objType.getProperties()
+        for (const property of properties) {
+            const entry = entries.find(({ name }) => name === property.name)
+            if (!entry) continue
+            const type = typeChecker.getTypeOfSymbolAtLocation(property, node)
+            if (!type) continue
+            if (isMethodCompletionCall(type, typeChecker)) {
+                if (['above', 'remove'].includes(keepOriginal) && preferences.includeCompletionsWithObjectLiteralMethodSnippets) {
+                    const methodEntryIndex = entries.findIndex(e => e.name === entry.name && isObjectLiteralMethodSnippet(e))
+                    const methodEntry = entries[methodEntryIndex]
+                    if (methodEntry) {
+                        entries.splice(methodEntryIndex, 1)
+                        entries.splice(entries.indexOf(entry) + (keepOriginal === 'below' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
+                            ...methodEntry,
+                            // let correctSorting.enable sort it
+                            sortText: entry.sortText,
+                        })
                     }
-                    continue
-                }
-                if (!enableMoreVariants) continue
-                const getQuotedSnippet = (): [string, string] => {
-                    const quote = tsFull.getQuoteFromPreference(tsFull.getQuotePreference(node.getSourceFile() as any, preferences))
-                    return [`: ${quote}$1${quote},$0`, `: ${quote}${quote},`]
                 }
-                const insertObjectArrayInnerText = c('objectLiteralCompletions.insertNewLine') ? '\n\t$1\n' : '$1'
-                const completingStyleMap = [
-                    [getQuotedSnippet, isStringCompletion],
-                    [[`: [${insertObjectArrayInnerText}],$0`, `: [],`], isArrayCompletion],
-                    [[`: {${insertObjectArrayInnerText}},$0`, `: {},`], isObjectCompletion],
-                ] as const
-                const fallbackSnippet = c('objectLiteralCompletions.fallbackVariant') ? ([': $0,', ': ,'] as const) : undefined
-                const insertSnippetVariant = completingStyleMap.find(([, detector]) => detector(type, typeChecker))?.[0] ?? fallbackSnippet
-                if (!insertSnippetVariant) continue
-                const [insertSnippetText, insertSnippetPreview] = typeof insertSnippetVariant === 'function' ? insertSnippetVariant() : insertSnippetVariant
-                const insertText = entry.name + insertSnippetText
-                const index = entries.indexOf(entry)
-                entries.splice(index + (keepOriginal === 'below' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
-                    ...entry,
-                    // todo setting incompatible!!!
-                    sortText: entry.sortText,
-                    labelDetails: {
-                        detail: insertSnippetPreview,
-                    },
-                    insertText,
-                    isSnippet: true,
-                })
+                continue
+            }
+            if (!enableMoreVariants) continue
+            const getQuotedSnippet = (): [string, string] => {
+                const quote = tsFull.getQuoteFromPreference(tsFull.getQuotePreference(node.getSourceFile() as any, preferences))
+                return [`: ${quote}$1${quote},$0`, `: ${quote}${quote},`]
             }
-            return entries
+            const insertObjectArrayInnerText = c('objectLiteralCompletions.insertNewLine') ? '\n\t$1\n' : '$1'
+            const completingStyleMap = [
+                [getQuotedSnippet, isStringCompletion],
+                [[`: [${insertObjectArrayInnerText}],$0`, `: [],`], isArrayCompletion],
+                [[`: {${insertObjectArrayInnerText}},$0`, `: {},`], isObjectCompletion],
+            ] as const
+            const fallbackSnippet = c('objectLiteralCompletions.fallbackVariant') ? ([': $0,', ': ,'] as const) : undefined
+            const insertSnippetVariant = completingStyleMap.find(([, detector]) => detector(type, typeChecker))?.[0] ?? fallbackSnippet
+            if (!insertSnippetVariant) continue
+            const [insertSnippetText, insertSnippetPreview] = typeof insertSnippetVariant === 'function' ? insertSnippetVariant() : insertSnippetVariant
+            const insertText = entry.name + insertSnippetText
+            const index = entries.indexOf(entry)
+            entries.splice(index + (keepOriginal === 'below' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
+                ...entry,
+                // todo setting incompatible!!!
+                sortText: entry.sortText,
+                labelDetails: {
+                    detail: insertSnippetPreview,
+                },
+                insertText,
+                isSnippet: true,
+            })
         }
+        return entries
     }
 }
 

typescript/src/completionsAtPosition.ts

@@ -175,7 +175,7 @@ export const getCompletionsAtPosition = (
     }
 
     if (node) prior.entries = defaultHelpers(prior.entries, node, languageService) ?? prior.entries
-    if (node) prior.entries = objectLiteralCompletions(prior.entries, node, languageService, options ?? {}, c) ?? prior.entries
+    if (exactNode) prior.entries = objectLiteralCompletions(prior.entries, exactNode, languageService, options ?? {}, c) ?? prior.entries
 
     const banAutoImportPackages = c('suggestions.banAutoImportPackages')
     if (banAutoImportPackages?.length)