fix: make fixPropertiesSorting feature work almost everywhere (all known problems fixed)

Author: zardoy

typescript/src/completions/fixPropertiesSorting.ts

@@ -1,7 +1,11 @@
 import { oneOf } from '@zardoy/utils'
-import { groupBy, partition } from 'rambda'
+import { partition } from 'rambda'
+import { getAllPropertiesOfType } from './objectLiteralCompletions'
+import { sharedCompletionContext } from './sharedContext'
 
-export default (entries: ts.CompletionEntry[], node: ts.Node | undefined, sourceFile: ts.SourceFile, program: ts.Program) => {
+export default (entries: ts.CompletionEntry[]) => {
+    const { node, program, c } = sharedCompletionContext
+    if (!c('fixSuggestionsSorting')) return
     if (!node) return
     // if (ts.isObjectLiteralExpression(node) && ts.isCallExpression(node.parent)) {
     //     const typeChecker = program.getTypeChecker()
@@ -10,6 +14,7 @@ export default (entries: ts.CompletionEntry[], node: ts.Node | undefined, source
     // }
     let rightNode: ts.Node | undefined
     const upperNode = ts.isIdentifier(node) ? node.parent : node
+    if (ts.isObjectLiteralExpression(node)) rightNode = node
     if (ts.isPropertyAccessExpression(upperNode)) rightNode = upperNode.expression
     else if (ts.isObjectBindingPattern(node)) {
         if (ts.isVariableDeclaration(node.parent)) {
@@ -25,8 +30,8 @@ export default (entries: ts.CompletionEntry[], node: ts.Node | undefined, source
     }
     if (!rightNode) return
     const typeChecker = program.getTypeChecker()
-    const type = typeChecker.getTypeAtLocation(rightNode)
-    const sourceProps = type.getProperties?.()?.map(({ name }) => name)
+    const type = typeChecker.getContextualType(rightNode as ts.Expression) ?? typeChecker.getTypeAtLocation(rightNode)
+    const sourceProps = getAllPropertiesOfType(type, typeChecker)?.map(({ name }) => name)
     // languageService.getSignatureHelpItems(fileName, position, {}))
     if (!sourceProps) return
     // const entriesBySortText = groupBy(({ sortText }) => sortText, entries)

typescript/src/completions/objectLiteralCompletions.ts

@@ -20,16 +20,7 @@ export default (
         const typeChecker = languageService.getProgram()!.getTypeChecker()!
         const objType = typeChecker.getContextualType(node)
         if (!objType) return
-        const types = objType.isUnion() ? objType.types : [objType]
-        const properties = types
-            .flatMap(type => {
-                if (isFunctionType(type, typeChecker)) return []
-                if (isObjectCompletion(type, typeChecker)) return typeChecker.getPropertiesOfType(type)
-                return []
-            })
-            .filter((property, i, arr) => {
-                return !arr.find(({ name }, k) => name === property.name && i !== k)
-            })
+        const properties = getAllPropertiesOfType(objType, typeChecker)
         for (const property of properties) {
             const entry = entries.find(({ name }) => name === property.name)
             if (!entry) continue
@@ -136,3 +127,23 @@ const isObjectCompletion = (type: ts.Type, checker: ts.TypeChecker) => {
     if (type.isUnion()) return isEverySubtype(type, type => isObjectCompletion(type, checker))
     return false
 }
+
+export const getAllPropertiesOfType = (type: ts.Type, typeChecker: ts.TypeChecker) => {
+    const types = type.isUnion() ? type.types : [type]
+    let objectCount = 0
+    const properties = types
+        .flatMap(type => {
+            if (isFunctionType(type, typeChecker)) return []
+            if (isObjectCompletion(type, typeChecker)) {
+                objectCount++
+                return typeChecker.getPropertiesOfType(type)
+            }
+            return []
+        })
+        .filter((property, i, arr) => {
+            // perf
+            if (objectCount === 1) return true
+            return !arr.find(({ name }, k) => name === property.name && i !== k)
+        })
+    return properties
+}

typescript/src/completionsAtPosition.ts

@@ -169,7 +169,7 @@ export const getCompletionsAtPosition = (
         }
     }
 
-    if (c('fixSuggestionsSorting')) prior.entries = fixPropertiesSorting(prior.entries, leftNode, sourceFile, program) ?? prior.entries
+    prior.entries = fixPropertiesSorting(prior.entries) ?? prior.entries
     if (node) prior.entries = boostKeywordSuggestions(prior.entries, position, node) ?? prior.entries
 
     const entryNames = new Set(prior.entries.map(({ name }) => name))