Merge pull request microsoft#227011 from mjbvz/productive-bird

Fix organize imports setting

Author: mjbvz

extensions/typescript-language-features/package.json

@@ -1116,7 +1116,13 @@
                 "inline",
                 "first"
               ],
-              "default": "auto"
+              "default": "auto",
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.typeOrder.auto%",
+                "%typescript.preferences.organizeImports.typeOrder.last%",
+                "%typescript.preferences.organizeImports.typeOrder.inline%",
+                "%typescript.preferences.organizeImports.typeOrder.first%"
+              ]
             },
             "unicodeCollation": {
               "type": "string",
@@ -1180,7 +1186,13 @@
                 "inline",
                 "first"
               ],
-              "default": "auto"
+              "default": "auto",
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.typeOrder.auto%",
+                "%typescript.preferences.organizeImports.typeOrder.last%",
+                "%typescript.preferences.organizeImports.typeOrder.inline%",
+                "%typescript.preferences.organizeImports.typeOrder.first%"
+              ]
             },
             "unicodeCollation": {
               "type": "string",

extensions/typescript-language-features/package.nls.json

@@ -188,21 +188,21 @@
 	"typescript.preferences.renameShorthandProperties.deprecationMessage": "The setting 'typescript.preferences.renameShorthandProperties' has been deprecated in favor of 'typescript.preferences.useAliasesForRenames'",
 	"typescript.preferences.useAliasesForRenames": "Enable/disable introducing aliases for object shorthand properties during renames.",
 	"typescript.preferences.renameMatchingJsxTags": "When on a JSX tag, try to rename the matching tag instead of renaming the symbol. Requires using TypeScript 5.1+ in the workspace.",
-	"typescript.preferences.organizeImports": "Advanced preferences that control how imports are ordered. Presets are available in `#typescript.preferences.organizeImports.presets#`",
-	"javascript.preferences.organizeImports": "Advanced preferences that control how imports are ordered. Presets are available in `#javascript.preferences.organizeImports.presets#`",
-	"typescript.preferences.organizeImports.caseSensitivity.auto": "Detect case-sensitivity for import sorting",
-	"typescript.preferences.organizeImports.caseSensitivity.insensitive": "Sort imports case-insensitively",
-	"typescript.preferences.organizeImports.caseSensitivity.sensitive": "Sort imports case-sensitively",
-	"typescript.preferences.organizeImports.typeOrder.auto": "Detect where type-only named imports should be sorted",
-	"typescript.preferences.organizeImports.typeOrder.last": "Type only named imports are sorted to the end of the import list",
-	"typescript.preferences.organizeImports.typeOrder.inline": "Named imports are sorted by name only",
-	"typescript.preferences.organizeImports.typeOrder.first": "Type only named imports are sorted to the end of the import list",
-	"typescript.preferences.organizeImports.unicodeCollation.ordinal": "Sort imports using the numeric value of each code point",
-	"typescript.preferences.organizeImports.unicodeCollation.unicode": "Sort imports using the Unicode code collation",
-	"typescript.preferences.organizeImports.locale": "Overrides the locale used for collation. Specify `auto` to use the UI locale. Only applies to `organizeImportsCollation: 'unicode'`",
-	"typescript.preferences.organizeImports.caseFirst": "Indicates whether upper-case comes before lower-case. Only applies to `organizeImportsCollation: 'unicode'`",
-	"typescript.preferences.organizeImports.numericCollation": "Sort numeric strings by integer value",
-	"typescript.preferences.organizeImports.accentCollation": "Compare characters with diacritical marks as unequal to base character",
+	"typescript.preferences.organizeImports": "Advanced preferences that control how imports are ordered.",
+	"javascript.preferences.organizeImports": "Advanced preferences that control how imports are ordered.",
+	"typescript.preferences.organizeImports.caseSensitivity.auto": "Detect case-sensitivity for import sorting.",
+	"typescript.preferences.organizeImports.caseSensitivity.insensitive": "Sort imports case-insensitively.",
+	"typescript.preferences.organizeImports.caseSensitivity.sensitive": "Sort imports case-sensitively.",
+	"typescript.preferences.organizeImports.typeOrder.auto": "Detect where type-only named imports should be sorted.",
+	"typescript.preferences.organizeImports.typeOrder.last": "Type only named imports are sorted to the end of the import list.",
+	"typescript.preferences.organizeImports.typeOrder.inline": "Named imports are sorted by name only.",
+	"typescript.preferences.organizeImports.typeOrder.first": "Type only named imports are sorted to the end of the import list.",
+	"typescript.preferences.organizeImports.unicodeCollation.ordinal": "Sort imports using the numeric value of each code point.",
+	"typescript.preferences.organizeImports.unicodeCollation.unicode": "Sort imports using the Unicode code collation.",
+	"typescript.preferences.organizeImports.locale": "Overrides the locale used for collation. Specify `auto` to use the UI locale. Only applies to `organizeImportsCollation: 'unicode'`.",
+	"typescript.preferences.organizeImports.caseFirst": "Indicates whether upper-case comes before lower-case. Only applies to `organizeImportsCollation: 'unicode'`.",
+	"typescript.preferences.organizeImports.numericCollation": "Sort numeric strings by integer value.",
+	"typescript.preferences.organizeImports.accentCollation": "Compare characters with diacritical marks as unequal to base character.",
 	"typescript.workspaceSymbols.scope": "Controls which files are searched by [Go to Symbol in Workspace](https://code.visualstudio.com/docs/editor/editingevolved#_open-symbol-by-name).",
 	"typescript.workspaceSymbols.scope.allOpenProjects": "Search all open JavaScript or TypeScript projects for symbols.",
 	"typescript.workspaceSymbols.scope.currentProject": "Only search for symbols in the current JavaScript or TypeScript project.",

extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts

@@ -201,7 +201,7 @@ export default class FileConfigurationManager extends Disposable {
 			interactiveInlayHints: true,
 			includeCompletionsForModuleExports: config.get<boolean>('suggest.autoImports'),
 			...getInlayHintsPreferences(config),
-			...this.getOrganizeImportsPreferences(config),
+			...this.getOrganizeImportsPreferences(preferencesConfig),
 		};
 
 		return preferences;