[skip ci] fix: restore suggestions sorting in more locations

Author: zardoy

typescript/src/completions/fixPropertiesSorting.ts

@@ -8,11 +8,24 @@ export default (entries: ts.CompletionEntry[], node: ts.Node | undefined, source
     //     const type = typeChecker.getTypeAtLocation(node.parent)
     //     const callSignatures = type.getCallSignatures()
     // }
-    if (ts.isIdentifier(node)) node = node.parent
-    if (!ts.isPropertyAccessExpression(node)) return
+    let rightNode: ts.Node | undefined
+    const upperNode = ts.isIdentifier(node) ? node.parent : node
+    if (ts.isPropertyAccessExpression(upperNode)) rightNode = upperNode.expression
+    else if (ts.isObjectBindingPattern(node)) {
+        if (ts.isVariableDeclaration(node.parent)) {
+            const { initializer } = node.parent
+            if (initializer) {
+                if (ts.isIdentifier(initializer)) rightNode = initializer
+                if (ts.isPropertyAccessExpression(initializer)) rightNode = initializer.name
+            }
+        }
+        if (ts.isParameter(node.parent)) rightNode = node.parent.type
+    } else if (ts.isObjectLiteralExpression(node) && ts.isReturnStatement(node.parent) && ts.isArrowFunction(node.parent.parent.parent)) {
+        rightNode = node.parent.parent.parent.type
+    }
+    if (!rightNode) return
     const typeChecker = program.getTypeChecker()
-    const expr = node.expression
-    const type = typeChecker.getTypeAtLocation(expr)
+    const type = typeChecker.getTypeAtLocation(rightNode)
     const sourceProps = type.getProperties?.()?.map(({ name }) => name)
     // languageService.getSignatureHelpItems(fileName, position, {}))
     if (!sourceProps) return
@@ -22,13 +35,13 @@ export default (entries: ts.CompletionEntry[], node: ts.Node | undefined, source
         entries,
     )
     // if sortText first symbol is not a number, than most probably it was highlighted by IntelliCode, keep them high
-    const [sortableEntries, notSortableEntries] = partition(entry => !isNaN(+entry.sortText), interestedEntries)
-    const lowestSortText = Math.min(...sortableEntries.map(({ sortText }) => +sortText))
+    const [sortableEntries, notSortableEntries] = partition(entry => !isNaN(parseInt(entry.sortText)), interestedEntries)
+    const lowestSortText = Math.min(...sortableEntries.map(({ sortText }) => parseInt(sortText)))
     // make sorted
-    sortableEntries
+    const sortedEntries = sortableEntries
         .sort((a, b) => {
             return sourceProps.indexOf(a.name) - sourceProps.indexOf(b.name)
         })
         .map((entry, i) => ({ ...entry, sortText: String(lowestSortText + i) }))
-    return [...notSortableEntries, ...sortableEntries, ...notInterestedEntries]
+    return [...notSortableEntries, ...sortedEntries, ...notInterestedEntries]
 }