fix(regression): fix properties sorting feature in most cases

feat: Now locality bonus is used only for global completion, so it doesn't conflict with fix properties sorting feature and it seems to be more logical.

Author: zardoy

typescript/src/completions/fixPropertiesSorting.ts

@@ -60,6 +60,6 @@ export default (entries: ts.CompletionEntry[]) => {
         .sort((a, b) => {
             return getScore(a) - getScore(b)
         })
-        .map((entry, i) => ({ ...entry /* sortText: String(lowestSortText + i) */ }))
+        .map((entry, i) => ({ ...entry, sortText: String(Number.parseInt(entry.sortText, 10)) }))
     return [...notSortableEntries, ...sortedEntries, ...notInterestedEntries]
 }

typescript/src/completions/localityBonus.ts

@@ -1,8 +1,8 @@
 import { sharedCompletionContext } from './sharedContext'
 
 export default (entries: ts.CompletionEntry[]) => {
-    const { node, sourceFile, c, position } = sharedCompletionContext
-    if (!c('suggestions.localityBonus')) return
+    const { node, sourceFile, c, position, prior } = sharedCompletionContext
+    if (!c('suggestions.localityBonus') || prior.isMemberCompletion) return
 
     if (!node) return
     const LOWEST_SCORE = node.getSourceFile().getFullText().length

typescript/src/completions/sharedContext.ts

@@ -3,6 +3,7 @@ import { GetConfig } from '../types'
 
 /** Must be used within functions */
 export const sharedCompletionContext = {} as unknown as Readonly<{
+    prior: ts.CompletionInfo
     position: number
     sourceFile: ts.SourceFile
     program: ts.Program

typescript/src/completionsAtPosition.ts

@@ -74,18 +74,6 @@ export const getCompletionsAtPosition = (
     const exactNode = findChildContainingExactPosition(sourceFile, position)
     const isCheckedFile =
         !tsFull.isSourceFileJS(sourceFile as any) || !!tsFull.isCheckJsEnabledForFile(sourceFile as any, additionalData.compilerOptions as any)
-    Object.assign(sharedCompletionContext, {
-        position,
-        languageService,
-        sourceFile,
-        program,
-        isCheckedFile,
-        node: exactNode,
-        prevCompletionsMap,
-        c,
-        formatOptions: formatOptions || {},
-        preferences: options || {},
-    } satisfies typeof sharedCompletionContext)
     const unpatch = patchBuiltinMethods(c, languageService, isCheckedFile)
     const getPrior = () => {
         try {
@@ -156,6 +144,20 @@ export const getCompletionsAtPosition = (
 
     if (!prior) return
 
+    Object.assign(sharedCompletionContext, {
+        position,
+        languageService,
+        sourceFile,
+        program,
+        isCheckedFile,
+        node: exactNode,
+        prevCompletionsMap,
+        c,
+        formatOptions: formatOptions || {},
+        preferences: options || {},
+        prior,
+    } satisfies typeof sharedCompletionContext)
+
     if (c('tupleHelpSignature') && node) {
         const tupleSignature = getTupleSignature(node, program.getTypeChecker()!)
         if (tupleSignature) {

typescript/test/completions.spec.ts

@@ -471,7 +471,7 @@ test('Fix properties sorting', () => {
     overrideSettings({
         fixSuggestionsSorting: true,
     })
-    const tester = fourslashLikeTester(/* tsx */ `
+    fourslashLikeTester(/* tsx */ `
         let a: {
             d
             b(a: {c, a}): {c, a}
@@ -486,22 +486,20 @@ test('Fix properties sorting', () => {
 
         declare function MyComponent(props: { b?; c? } & { a? }): JSX.Element
         <MyComponent /*4*/ />;
+
+        let a: { b:{}, a() } = {
+            /*5*/
+        }
     `)
-    tester.completion(1, {
-        exact: {
-            names: ['c', 'b'],
-        },
-    })
-    tester.completion([2, 3], {
-        exact: {
-            names: ['c', 'b'],
-        },
-    })
-    tester.completion(4, {
-        exact: {
-            names: ['b', 'c', 'a'],
-        },
-    })
+    const assertSorted = (marker: number, expected: string[]) => {
+        const { entriesSorted } = getCompletionsAtPosition(currentTestingContext.markers[marker]!)!
+        expect(entriesSorted.map(x => x.name)).toEqual(expected)
+    }
+    assertSorted(1, ['c', 'b'])
+    assertSorted(2, ['c', 'b'])
+    assertSorted(3, ['c', 'b'])
+    assertSorted(4, ['b', 'c', 'a'])
+    assertSorted(5, ['b', 'b', 'a', 'a'])
     settingsOverride.fixSuggestionsSorting = false
 })