fix: fix meanings of values for objectLiteralCompletions.keepOriginal (no user action required)

Author: zardoy

src/configurationType.ts

@@ -498,11 +498,11 @@ export type Configuration = {
      */
     // 'objectLiteralCompletions.deepVariants': 'disable' | 'displayBelow' | 'replaceNotDeep'
     /**
-     * Also affects builtin typescript.suggest.objectLiteralMethodSnippets, even when additional completions disabled
-     * @default below
+     * How to position original suggestion relative to snippet suggestion.
+     * Also affects builtin typescript.suggest.objectLiteralMethodSnippets, even when additional plugin completions disabled
+     * @default before
      */
-    // TODO its a bug, change to after & before with fixed behavior
-    'objectLiteralCompletions.keepOriginal': 'below' | 'above' | 'remove'
+    'objectLiteralCompletions.keepOriginal': 'before' | 'after' | 'remove'
     /**
      * Wether to exclude non-JSX components completions in JSX component locations
      * Requires TypeScript 5.0+

src/migrateSettings.ts

@@ -1,4 +1,6 @@
+import * as vscode from 'vscode'
 import { migrateExtensionSettings } from '@zardoy/vscode-utils/build/migrateSettings'
+import { Settings } from 'vscode-framework'
 
 export default () => {
     void migrateExtensionSettings(
@@ -31,7 +33,34 @@ export default () => {
                     mustBePrimitive: false,
                 },
             },
+            {
+                async detect(configuration) {
+                    return !!(await migrateSettingValues(configuration, true))
+                },
+                async handle(configuration) {
+                    return (await migrateSettingValues(configuration, false))!
+                },
+            },
         ],
         process.env.IDS_PREFIX!,
     )
 }
+
+async function migrateSettingValues(configuration: vscode.WorkspaceConfiguration, detectOnly: boolean) {
+    const keepOriginalSettingKey: keyof Settings = 'objectLiteralCompletions.keepOriginal'
+    const keepOriginal = configuration.get<string>(keepOriginalSettingKey)!
+    const keepOriginalNewValuesMap = {
+        below: 'before',
+        above: 'after',
+    }
+    const newKeepOriginalValue = keepOriginalNewValuesMap[keepOriginal]
+    if (newKeepOriginalValue) {
+        if (!detectOnly) {
+            await configuration.update(keepOriginalSettingKey, newKeepOriginalValue, vscode.ConfigurationTarget.Global)
+        }
+
+        return keepOriginalSettingKey
+    }
+
+    return undefined
+}

typescript/src/completions/objectLiteralCompletions.ts

@@ -32,7 +32,7 @@ export default (
                     const methodEntry = entries[methodEntryIndex]
                     if (methodEntry) {
                         entries.splice(methodEntryIndex, 1)
-                        entries.splice(entries.indexOf(entry) + (keepOriginal === 'below' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
+                        entries.splice(entries.indexOf(entry) + (keepOriginal === 'before' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
                             ...methodEntry,
                             // let correctSorting.enable sort it
                             sortText: entry.sortText,
@@ -59,7 +59,7 @@ export default (
             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, {
+            entries.splice(index + (keepOriginal === 'before' ? 1 : 0), keepOriginal === 'remove' ? 1 : 0, {
                 ...entry,
                 // todo setting incompatible!!!
                 sortText: entry.sortText,