add experimental fixSuggestionsSorting for object property access

Author: zardoy

package.json

@@ -82,6 +82,7 @@
         "mocha": "^10.0.0",
         "modify-json-file": "^1.2.2",
         "pluralize": "github:plurals/pluralize#36f03cd2d573fa6d23e12e1529fa4627e2af74b4",
+        "rambda": "^7.2.1",
         "require-from-string": "^2.0.2",
         "string-dedent": "^3.0.1",
         "vscode-framework": "^0.0.18"

pnpm-lock.yaml

@@ -81,10 +81,17 @@ export type Configuration = {
      * */
     'highlightNonFunctionMethods.enable': boolean
     /**
-     * Use originl sorting of suggestions (almost like in WebStorm). Works only with TypeScript <= 4.5.5
+     * Normalize sorting of suggestions after plugin modifications
+     * You most probably don't need to disable it
      * @default true
      * */
     'correctSorting.enable': boolean
+    /**
+     * Try to restore suggestion sorting after `.`
+     * Experimental and most probably will be changed in future
+     * @default false
+     */
+    fixSuggestionsSorting: boolean
     // TODO
     /**
      * Mark QuickFixes & refactorings with 🔵

src/configurationType.ts

@@ -1,16 +1,34 @@
-import type tslib from 'typescript/lib/tsserverlibrary'
+import { oneOf } from '@zardoy/utils'
+import { groupBy, partition } from 'rambda'
 
-export default (
-    position: number,
-    node: tslib.Node | undefined,
-    scriptSnapshot: tslib.IScriptSnapshot,
-    sourceFile: tslib.SourceFile,
-    program: tslib.Program,
-    ts: typeof tslib,
-) => {
+export default (entries: ts.CompletionEntry[], node: ts.Node | undefined, sourceFile: ts.SourceFile, program: ts.Program) => {
     if (!node) return
-    // TO BE DONE HERE
-    // const typeChecker = program.getTypeChecker()
-    // const type = typeChecker.getTypeAtLocation(node)
-    // console.log(typeChecker.getAugmentedPropertiesOfType(type).map(({ name }) => name))
+    // if (ts.isObjectLiteralExpression(node) && ts.isCallExpression(node.parent)) {
+    //     const typeChecker = program.getTypeChecker()
+    //     const type = typeChecker.getTypeAtLocation(node.parent)
+    //     const callSignatures = type.getCallSignatures()
+    // }
+    if (ts.isIdentifier(node)) node = node.parent
+    if (!ts.isPropertyAccessExpression(node)) return
+    const typeChecker = program.getTypeChecker()
+    const expr = node.expression
+    const type = typeChecker.getTypeAtLocation(expr)
+    const sourceProps = type.getProperties?.()?.map(({ name }) => name)
+    // languageService.getSignatureHelpItems(fileName, position, {}))
+    if (!sourceProps) return
+    // const entriesBySortText = groupBy(({ sortText }) => sortText, entries)
+    const [interestedEntries, notInterestedEntries] = partition(
+        entry => oneOf(entry.kind, ts.ScriptElementKind.memberVariableElement, ts.ScriptElementKind.memberFunctionElement),
+        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))
+    // make sorted
+    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]
 }

typescript/src/completions/fixPropertiesSorting.ts

@@ -132,6 +132,8 @@ export const getCompletionsAtPosition = (
 
     if (!prior) return
 
+    if (c('fixSuggestionsSorting')) prior.entries = fixPropertiesSorting(prior.entries, leftNode, sourceFile, program) ?? prior.entries
+
     const entryNames = new Set(prior.entries.map(({ name }) => name))
     if (c('removeUselessFunctionProps.enable')) prior.entries = prior.entries.filter(e => !['Symbol', 'caller', 'prototype'].includes(e.name))
     if (['bind', 'call', 'caller'].every(name => entryNames.has(name)) && c('highlightNonFunctionMethods.enable')) {