@codingame/monaco-vscode-api 7.0.11 → 7.1.1

package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import '../../../../platform/instantiation/common/extensions.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
@@ -23,7 +23,6 @@ import { IMarkerService } from '../../../../platform/markers/common/markers.serv
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import '../../../../platform/instantiation/common/instantiation.js';
 var FilesConfigurationService_1;
-const _moduleId = "vs/workbench/services/filesConfiguration/common/filesConfigurationService";
 const AutoSaveAfterShortDelayContext = ( (new RawContextKey('autoSaveAfterShortDelayContext', false, true)));
 var AutoSaveMode;
 ( ((function(AutoSaveMode) {
@@ -45,31 +44,27 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
     static { this.DEFAULT_AUTO_SAVE_MODE = isWeb ? AutoSaveConfiguration.AFTER_DELAY : AutoSaveConfiguration.OFF; }
     static { this.DEFAULT_AUTO_SAVE_DELAY = 1000; }
     static { this.READONLY_MESSAGES = {
-        providerReadonly: { value: ( localizeWithPath(
-            _moduleId,
-            0,
+        providerReadonly: { value: ( localize(
+            645,
             "Editor is read-only because the file system of the file is read-only."
         )), isTrusted: true },
-        sessionReadonly: { value: ( localizeWithPath(
-            _moduleId,
-            1,
+        sessionReadonly: { value: ( localize(
+            646,
             "Editor is read-only because the file was set read-only in this session. [Click here](command:{0}) to set writeable.",
             'workbench.action.files.setActiveEditorWriteableInSession'
         )), isTrusted: true },
-        configuredReadonly: { value: ( localizeWithPath(
-            _moduleId,
-            2,
+        configuredReadonly: { value: ( localize(
+            647,
             "Editor is read-only because the file was set read-only via settings. [Click here](command:{0}) to configure or [toggle for this session](command:{1}).",
             `workbench.action.openSettings?${encodeURIComponent('["files.readonly"]')}`,
             'workbench.action.files.toggleActiveEditorReadonlyInSession'
         )), isTrusted: true },
-        fileLocked: { value: ( localizeWithPath(
-            _moduleId,
-            3,
+        fileLocked: { value: ( localize(
+            648,
             "Editor is read-only because of file permissions. [Click here](command:{0}) to set writeable anyway.",
             'workbench.action.files.setActiveEditorWriteableInSession'
         )), isTrusted: true },
-        fileReadonly: { value: ( localizeWithPath(_moduleId, 4, "Editor is read-only because the file is read-only.")), isTrusted: true }
+        fileReadonly: { value: ( localize(649, "Editor is read-only because the file is read-only.")), isTrusted: true }
     }; }
     constructor(contextKeyService, configurationService, contextService, environmentService, uriIdentityService, fileService, markerService, textResourceConfigurationService) {
         super();
@@ -209,10 +204,10 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
         let autoSaveWhenNoErrors;
         let isOutOfWorkspace;
         let isShortAutoSaveDelay;
-        switch (filesConfiguration.autoSave ?? FilesConfigurationService_1.DEFAULT_AUTO_SAVE_MODE) {
+        switch (filesConfiguration?.autoSave ?? FilesConfigurationService_1.DEFAULT_AUTO_SAVE_MODE) {
             case AutoSaveConfiguration.AFTER_DELAY: {
                 autoSave = 'afterDelay';
-                autoSaveDelay = typeof filesConfiguration.autoSaveDelay === 'number' && filesConfiguration.autoSaveDelay >= 0 ? filesConfiguration.autoSaveDelay : FilesConfigurationService_1.DEFAULT_AUTO_SAVE_DELAY;
+                autoSaveDelay = typeof filesConfiguration?.autoSaveDelay === 'number' && filesConfiguration.autoSaveDelay >= 0 ? filesConfiguration.autoSaveDelay : FilesConfigurationService_1.DEFAULT_AUTO_SAVE_DELAY;
                 isShortAutoSaveDelay = autoSaveDelay <= FilesConfigurationService_1.DEFAULT_AUTO_SAVE_DELAY;
                 break;
             }
@@ -223,14 +218,14 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
                 autoSave = 'onWindowChange';
                 break;
         }
-        if (filesConfiguration.autoSaveWorkspaceFilesOnly === true) {
+        if (filesConfiguration?.autoSaveWorkspaceFilesOnly === true) {
             autoSaveWorkspaceFilesOnly = true;
             if (resource && !this.contextService.isInsideWorkspace(resource)) {
                 isOutOfWorkspace = true;
                 isShortAutoSaveDelay = undefined;
             }
         }
-        if (filesConfiguration.autoSaveWhenNoErrors === true) {
+        if (filesConfiguration?.autoSaveWhenNoErrors === true) {
             autoSaveWhenNoErrors = true;
             isShortAutoSaveDelay = undefined;
         }

package/vscode/src/vs/workbench/services/language/common/languageService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { clearConfiguredLanguageAssociations, registerConfiguredLanguageAssociation } from '../../../../editor/common/services/languagesAssociations.js';
 import { joinPath } from '../../../../base/common/resources.js';
 import '../../../../platform/instantiation/common/instantiation.js';
@@ -18,29 +18,28 @@ import { SyncDescriptor } from '../../../../platform/instantiation/common/descri
 import { index } from '../../../../base/common/arrays.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { isString } from '../../../../base/common/types.js';
-const _moduleId = "vs/workbench/services/language/common/languageService";
 const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languages',
     jsonSchema: {
-        description: ( localizeWithPath(_moduleId, 0, 'Contributes language declarations.')),
+        description: ( localize(2438, 'Contributes language declarations.')),
         type: 'array',
         items: {
             type: 'object',
             defaultSnippets: [{ body: { id: '${1:languageId}', aliases: ['${2:label}'], extensions: ['${3:extension}'], configuration: './language-configuration.json' } }],
             properties: {
                 id: {
-                    description: ( localizeWithPath(_moduleId, 1, 'ID of the language.')),
+                    description: ( localize(2439, 'ID of the language.')),
                     type: 'string'
                 },
                 aliases: {
-                    description: ( localizeWithPath(_moduleId, 2, 'Name aliases for the language.')),
+                    description: ( localize(2440, 'Name aliases for the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 extensions: {
-                    description: ( localizeWithPath(_moduleId, 3, 'File extensions associated to the language.')),
+                    description: ( localize(2441, 'File extensions associated to the language.')),
                     default: ['.foo'],
                     type: 'array',
                     items: {
@@ -48,38 +47,36 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                     }
                 },
                 filenames: {
-                    description: ( localizeWithPath(_moduleId, 4, 'File names associated to the language.')),
+                    description: ( localize(2442, 'File names associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 filenamePatterns: {
-                    description: ( localizeWithPath(_moduleId, 5, 'File name glob patterns associated to the language.')),
+                    description: ( localize(2443, 'File name glob patterns associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 mimetypes: {
-                    description: ( localizeWithPath(_moduleId, 6, 'Mime types associated to the language.')),
+                    description: ( localize(2444, 'Mime types associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 firstLine: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        7,
+                    description: ( localize(
+                        2445,
                         'A regular expression matching the first line of a file of the language.'
                     )),
                     type: 'string'
                 },
                 configuration: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        8,
+                    description: ( localize(
+                        2446,
                         'A relative path to a file containing configuration options for the language.'
                     )),
                     type: 'string',
@@ -87,18 +84,17 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 icon: {
                     type: 'object',
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        9,
+                    description: ( localize(
+                        2447,
                         'A icon to use as file icon, if no icon theme provides one for the language.'
                     )),
                     properties: {
                         light: {
-                            description: ( localizeWithPath(_moduleId, 10, 'Icon path when a light theme is used')),
+                            description: ( localize(2448, 'Icon path when a light theme is used')),
                             type: 'string'
                         },
                         dark: {
-                            description: ( localizeWithPath(_moduleId, 11, 'Icon path when a dark theme is used')),
+                            description: ( localize(2449, 'Icon path when a dark theme is used')),
                             type: 'string'
                         }
                     }
@@ -172,11 +168,11 @@ class LanguageTableRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localizeWithPath(_moduleId, 12, "ID")),
-            ( localizeWithPath(_moduleId, 13, "Name")),
-            ( localizeWithPath(_moduleId, 14, "File Extensions")),
-            ( localizeWithPath(_moduleId, 15, "Grammar")),
-            ( localizeWithPath(_moduleId, 16, "Snippets"))
+            ( localize(2450, "ID")),
+            ( localize(2451, "Name")),
+            ( localize(2452, "File Extensions")),
+            ( localize(2453, "Grammar")),
+            ( localize(2454, "Snippets"))
         ];
         const rows = ( (languages.sort((a, b) => a.id.localeCompare(b.id))
             .map(l => {
@@ -198,7 +194,7 @@ class LanguageTableRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'languages',
-    label: ( localizeWithPath(_moduleId, 17, "Programming Languages")),
+    label: ( localize(2455, "Programming Languages")),
     access: {
         canToggle: false
     },
@@ -215,9 +211,8 @@ let WorkbenchLanguageService = class WorkbenchLanguageService extends LanguageSe
             for (let i = 0, len = extensions.length; i < len; i++) {
                 const extension = extensions[i];
                 if (!Array.isArray(extension.value)) {
-                    extension.collector.error(( localizeWithPath(
-                        _moduleId,
-                        18,
+                    extension.collector.error(( localize(
+                        2456,
                         "Invalid `contributes.{0}`. Expected an array.",
                         languagesExtPoint.name
                     )));
@@ -297,67 +292,56 @@ function isUndefinedOrStringArray(value) {
 }
 function isValidLanguageExtensionPoint(value, collector) {
     if (!value) {
-        collector?.error(( localizeWithPath(_moduleId, 19, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
+        collector?.error(( localize(2457, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
         return false;
     }
     if (typeof value.id !== 'string') {
-        collector?.error(( localizeWithPath(
-            _moduleId,
-            20,
-            "property `{0}` is mandatory and must be of type `string`",
-            'id'
-        )));
+        collector?.error(( localize(2458, "property `{0}` is mandatory and must be of type `string`", 'id')));
         return false;
     }
     if (!isUndefinedOrStringArray(value.extensions)) {
-        collector?.error(( localizeWithPath(
-            _moduleId,
-            21,
+        collector?.error(( localize(
+            2459,
             "property `{0}` can be omitted and must be of type `string[]`",
             'extensions'
         )));
         return false;
     }
     if (!isUndefinedOrStringArray(value.filenames)) {
-        collector?.error(( localizeWithPath(
-            _moduleId,
-            22,
+        collector?.error(( localize(
+            2460,
             "property `{0}` can be omitted and must be of type `string[]`",
             'filenames'
         )));
         return false;
     }
     if (typeof value.firstLine !== 'undefined' && typeof value.firstLine !== 'string') {
-        collector?.error(( localizeWithPath(
-            _moduleId,
-            23,
+        collector?.error(( localize(
+            2461,
             "property `{0}` can be omitted and must be of type `string`",
             'firstLine'
         )));
         return false;
     }
     if (typeof value.configuration !== 'undefined' && typeof value.configuration !== 'string') {
-        collector?.error(( localizeWithPath(
-            _moduleId,
-            24,
+        collector?.error(( localize(
+            2462,
             "property `{0}` can be omitted and must be of type `string`",
             'configuration'
         )));
         return false;
     }
     if (!isUndefinedOrStringArray(value.aliases)) {
-        collector?.error(( localizeWithPath(
-            _moduleId,
-            25,
+        collector?.error(( localize(
+            2463,
             "property `{0}` can be omitted and must be of type `string[]`",
             'aliases'
         )));
         return false;
     }
     if (!isUndefinedOrStringArray(value.mimetypes)) {
-        collector?.error(( localizeWithPath(
-            _moduleId,
-            26,
+        collector?.error(( localize(
+            2464,
             "property `{0}` can be omitted and must be of type `string[]`",
             'mimetypes'
         )));
@@ -365,9 +349,8 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (typeof value.icon !== 'undefined') {
         if (typeof value.icon !== 'object' || typeof value.icon.light !== 'string' || typeof value.icon.dark !== 'string') {
-            collector?.error(( localizeWithPath(
-                _moduleId,
-                27,
+            collector?.error(( localize(
+                2465,
                 "property `{0}` can be omitted and must be of type `object` with properties `{1}` and `{2}` of type `string`",
                 'icon',
                 'light',

package/vscode/src/vs/workbench/services/layout/browser/layoutService.d.ts

@@ -11,7 +11,8 @@ declare const enum Parts {
 declare const enum Position {
     LEFT = 0,
     RIGHT = 1,
-    BOTTOM = 2
+    BOTTOM = 2,
+    TOP = 3
 }
 type PanelAlignment = 'left' | 'center' | 'right' | 'justify';
 type MULTI_WINDOW_PARTS = Parts.EDITOR_PART | Parts.STATUSBAR_PART | Parts.TITLEBAR_PART;

package/vscode/src/vs/workbench/services/layout/browser/layoutService.js

@@ -56,7 +56,11 @@ var Position;
     Position[Position["LEFT"] = 0] = "LEFT";
     Position[Position["RIGHT"] = 1] = "RIGHT";
     Position[Position["BOTTOM"] = 2] = "BOTTOM";
+    Position[Position["TOP"] = 3] = "TOP";
 })(Position || (Position = {})));
+function isHorizontal(position) {
+    return position === Position.BOTTOM || position === Position.TOP;
+}
 var PanelOpensMaximizedOptions;
 ( (function(PanelOpensMaximizedOptions) {
     PanelOpensMaximizedOptions[PanelOpensMaximizedOptions["ALWAYS"] = 0] = "ALWAYS";
@@ -68,13 +72,15 @@ function positionToString(position) {
         case Position.LEFT: return 'left';
         case Position.RIGHT: return 'right';
         case Position.BOTTOM: return 'bottom';
+        case Position.TOP: return 'top';
         default: return 'bottom';
     }
 }
 const positionsByString = {
     [positionToString(Position.LEFT)]: Position.LEFT,
     [positionToString(Position.RIGHT)]: Position.RIGHT,
-    [positionToString(Position.BOTTOM)]: Position.BOTTOM
+    [positionToString(Position.BOTTOM)]: Position.BOTTOM,
+    [positionToString(Position.TOP)]: Position.TOP
 };
 function positionFromString(str) {
     return positionsByString[str];
@@ -155,4 +161,4 @@ function isTitleBarEmpty(configurationService) {
     }
     return true;
 }
-export { ActivityBarPosition, EditorActionsLocation, EditorTabsMode, LayoutSettings, PanelOpensMaximizedOptions, Parts, Position, ZenModeSettings, panelOpensMaximizedFromString, positionFromString, positionToString, shouldShowCustomTitleBar };
+export { ActivityBarPosition, EditorActionsLocation, EditorTabsMode, LayoutSettings, PanelOpensMaximizedOptions, Parts, Position, ZenModeSettings, isHorizontal, panelOpensMaximizedFromString, positionFromString, positionToString, shouldShowCustomTitleBar };

package/vscode/src/vs/workbench/services/lifecycle/common/lifecycle.d.ts

@@ -38,9 +38,29 @@ interface BeforeShutdownErrorEvent {
      */
     readonly error: Error;
 }
+declare enum WillShutdownJoinerOrder {
+    /**
+     * Joiners to run before the `Last` joiners. This is the default order and best for
+     * most cases. You can be sure that services are still functional at this point.
+     */
+    Default = 1,
+    /**
+     * The joiners to run last. This should ONLY be used in rare cases when you have no
+     * dependencies to workbench services or state. The workbench may be in a state where
+     * resources can no longer be accessed or changed.
+     */
+    Last = 2
+}
 interface IWillShutdownEventJoiner {
-    id: string;
-    label: string;
+    readonly id: string;
+    readonly label: string;
+    readonly order?: WillShutdownJoinerOrder;
+}
+interface IWillShutdownEventDefaultJoiner extends IWillShutdownEventJoiner {
+    readonly order?: WillShutdownJoinerOrder.Default;
+}
+interface IWillShutdownEventLastJoiner extends IWillShutdownEventJoiner {
+    readonly order: WillShutdownJoinerOrder.Last;
 }
 /**
  * An event that is send out when the window closes. Clients have a chance to join the closing
@@ -64,10 +84,20 @@ interface WillShutdownEvent {
      * Allows to join the shutdown. The promise can be a long running operation but it
      * will block the application from closing.
      *
+     * @param promise the promise to join the shutdown event.
+     * @param joiner to identify the join operation in case it takes very long or never
+     * completes.
+     */
+    join(promise: Promise<void>, joiner: IWillShutdownEventDefaultJoiner): void;
+    /**
+     * Allows to join the shutdown at the end. The promise can be a long running operation but it
+     * will block the application from closing.
+     *
+     * @param promiseFn the promise to join the shutdown event.
      * @param joiner to identify the join operation in case it takes very long or never
      * completes.
      */
-    join(promise: Promise<void>, joiner: IWillShutdownEventJoiner): void;
+    join(promiseFn: (() => Promise<void>), joiner: IWillShutdownEventLastJoiner): void;
     /**
      * Allows to access the joiners that have not finished joining this event.
      */
@@ -128,4 +158,4 @@ declare const enum LifecyclePhase {
     Eventually = 4
 }
 
-export { type BeforeShutdownErrorEvent, type BeforeShutdownEvent, type IWillShutdownEventJoiner, LifecyclePhase, ShutdownReason, StartupKind, type WillShutdownEvent };
+export { type BeforeShutdownErrorEvent, type BeforeShutdownEvent, type IWillShutdownEventDefaultJoiner, type IWillShutdownEventJoiner, type IWillShutdownEventLastJoiner, LifecyclePhase, ShutdownReason, StartupKind, type WillShutdownEvent, WillShutdownJoinerOrder };

package/vscode/src/vs/workbench/services/lifecycle/common/lifecycle.js

@@ -1,3 +1,8 @@
+var WillShutdownJoinerOrder;
+( (function(WillShutdownJoinerOrder) {
+    WillShutdownJoinerOrder[WillShutdownJoinerOrder["Default"] = 1] = "Default";
+    WillShutdownJoinerOrder[WillShutdownJoinerOrder["Last"] = 2] = "Last";
+})(WillShutdownJoinerOrder || (WillShutdownJoinerOrder = {})));
 var ShutdownReason;
 ( (function(ShutdownReason) {
     ShutdownReason[ShutdownReason["CLOSE"] = 1] = "CLOSE";
@@ -33,4 +38,4 @@ function LifecyclePhaseToString(phase) {
         case LifecyclePhase.Eventually: return 'Eventually';
     }
 }
-export { LifecyclePhase, LifecyclePhaseToString, ShutdownReason, StartupKind, StartupKindToString };
+export { LifecyclePhase, LifecyclePhaseToString, ShutdownReason, StartupKind, StartupKindToString, WillShutdownJoinerOrder };

package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from '../../../../base/common/event.js';
 import { Barrier } from '../../../../base/common/async.js';
+import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { LifecyclePhase, StartupKind, ShutdownReason, LifecyclePhaseToString } from './lifecycle.js';
-import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { mark } from '../../../../base/common/performance.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { WillSaveStateReason, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+import { LifecyclePhase, StartupKind, LifecyclePhaseToString, ShutdownReason } from './lifecycle.js';
 var AbstractLifecycleService_1;
 let AbstractLifecycleService = class AbstractLifecycleService extends Disposable {
     static { AbstractLifecycleService_1 = this; }

package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js

@@ -1,14 +1,13 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { OS } from '../../../../base/common/platform.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { KeybindingsEditorModel } from './keybindingsEditorModel.js';
 var KeybindingsEditorInput_1;
-const _moduleId = "vs/workbench/services/preferences/browser/keybindingsEditorInput";
-const KeybindingsEditorIcon = registerIcon('keybindings-editor-label-icon', Codicon.keyboard, ( localizeWithPath(_moduleId, 0, 'Icon of the keybindings editor label.')));
+const KeybindingsEditorIcon = registerIcon('keybindings-editor-label-icon', Codicon.keyboard, ( localize(6230, 'Icon of the keybindings editor label.')));
 let KeybindingsEditorInput = class KeybindingsEditorInput extends EditorInput {
     static { KeybindingsEditorInput_1 = this; }
     static { this.ID = 'workbench.input.keybindings'; }
@@ -22,7 +21,7 @@ let KeybindingsEditorInput = class KeybindingsEditorInput extends EditorInput {
         return KeybindingsEditorInput_1.ID;
     }
     getName() {
-        return ( localizeWithPath(_moduleId, 1, "Keyboard Shortcuts"));
+        return ( localize(6231, "Keyboard Shortcuts"));
     }
     getIcon() {
         return KeybindingsEditorIcon;

package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { coalesce, distinct } from '../../../../base/common/arrays.js';
 import { compareIgnoreCase, equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { Language } from '../../../../base/common/platform.js';
@@ -15,11 +15,10 @@ import { IExtensionService } from '../../extensions/common/extensions.service.js
 import { ExtensionIdentifier, ExtensionIdentifierMap } from '../../../../platform/extensions/common/extensions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 var KeybindingsEditorModel_1;
-const _moduleId = "vs/workbench/services/preferences/browser/keybindingsEditorModel";
 const KEYBINDING_ENTRY_TEMPLATE_ID = 'keybinding.entry.template';
-const SOURCE_SYSTEM = ( localizeWithPath(_moduleId, 0, "System"));
-const SOURCE_EXTENSION = ( localizeWithPath(_moduleId, 1, "Extension"));
-const SOURCE_USER = ( localizeWithPath(_moduleId, 2, "User"));
+const SOURCE_SYSTEM = ( localize(4820, "System"));
+const SOURCE_EXTENSION = ( localize(4821, "Extension"));
+const SOURCE_USER = ( localize(4822, "User"));
 function createKeybindingCommandQuery(commandId, when) {
     const whenPart = when ? ` +when:${when}` : '';
     return `@command:${commandId}${whenPart}`;
@@ -265,7 +264,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
             if (menuCommand && menuCommand.title && menuCommand.title.original) {
                 const category = menuCommand.category ? menuCommand.category.original : undefined;
                 const title = menuCommand.title.original;
-                return category ? ( localizeWithPath(_moduleId, 3, "{0}: {1}", category, title)) : title;
+                return category ? ( localize(4823, "{0}: {1}", category, title)) : title;
             }
         }
         return null;
@@ -274,7 +273,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         if (menuCommand) {
             const category = menuCommand.category ? typeof menuCommand.category === 'string' ? menuCommand.category : menuCommand.category.value : undefined;
             const title = typeof menuCommand.title === 'string' ? menuCommand.title : menuCommand.title.value;
-            return category ? ( localizeWithPath(_moduleId, 3, "{0}: {1}", category, title)) : title;
+            return category ? ( localize(4823, "{0}: {1}", category, title)) : title;
         }
         if (editorActionLabel) {
             return editorActionLabel;
@@ -554,7 +553,7 @@ class KeybindingItemMatches {
         if (equalsIgnoreCase(this.modifierLabels.user.altKey, word)) {
             return true;
         }
-        if (equalsIgnoreCase(( localizeWithPath(_moduleId, 4, "option")), word)) {
+        if (equalsIgnoreCase(( localize(4824, "option")), word)) {
             return true;
         }
         return false;
@@ -581,7 +580,7 @@ class KeybindingItemMatches {
         if (equalsIgnoreCase(this.modifierLabels.user.metaKey, word)) {
             return true;
         }
-        if (equalsIgnoreCase(( localizeWithPath(_moduleId, 5, "meta")), word)) {
+        if (equalsIgnoreCase(( localize(4825, "meta")), word)) {
             return true;
         }
         return false;

package/vscode/src/vs/workbench/services/preferences/common/preferences.d.ts

@@ -52,14 +52,12 @@ interface ISetting {
     extensionInfo?: IExtensionInfo;
     validator?: (value: any) => string | null;
     enumItemLabels?: string[];
-    allKeysAreBoolean?: boolean;
     editPresentation?: EditPresentationTypes;
     nonLanguageSpecificDefaultValueSource?: ConfigurationDefaultValueSource;
     isLanguageTagSetting?: boolean;
     categoryLabel?: string;
+    allKeysAreBoolean?: boolean;
     displayExtensionId?: string;
-    stableExtensionId?: string;
-    prereleaseExtensionId?: string;
     title?: string;
     extensionGroupTitle?: string;
     internalOrder?: number;

package/vscode/src/vs/workbench/services/preferences/common/preferences.js

@@ -38,4 +38,5 @@ const DEFINE_KEYBINDING_EDITOR_CONTRIB_ID = 'editor.contrib.defineKeybinding';
 const FOLDER_SETTINGS_PATH = '.vscode/settings.json';
 const DEFAULT_SETTINGS_EDITOR_SETTING = 'workbench.settings.openDefaultSettings';
 const USE_SPLIT_JSON_SETTING = 'workbench.settings.useSplitJSON';
-export { DEFAULT_SETTINGS_EDITOR_SETTING, DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, FOLDER_SETTINGS_PATH, SettingMatchType, SettingValueType, USE_SPLIT_JSON_SETTING, validateSettingsEditorOptions };
+const SETTINGS_AUTHORITY = 'settings';
+export { DEFAULT_SETTINGS_EDITOR_SETTING, DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, FOLDER_SETTINGS_PATH, SETTINGS_AUTHORITY, SettingMatchType, SettingValueType, USE_SPLIT_JSON_SETTING, validateSettingsEditorOptions };

package/vscode/src/vs/workbench/services/preferences/common/preferences.service.d.ts

@@ -1,6 +1,6 @@
 import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
+import { Event } from '../../../../base/common/event.js';
 import { URI } from '../../../../base/common/uri.js';
-import { ITextModel } from '../../../../editor/common/model.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { IEditorPane } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
@@ -10,11 +10,13 @@ import { IPreferencesEditorModel, ISetting, IOpenSettingsOptions, IKeybindingsEd
 declare const IPreferencesService: ServiceIdentifier<IPreferencesService>;
 interface IPreferencesService {
     readonly _serviceBrand: undefined;
+    readonly onDidDefaultSettingsContentChanged: Event<URI>;
     userSettingsResource: URI;
     workspaceSettingsResource: URI | null;
     getFolderSettingsResource(resource: URI): URI | null;
     createPreferencesEditorModel(uri: URI): Promise<IPreferencesEditorModel<ISetting> | null>;
-    resolveModel(uri: URI): ITextModel | null;
+    getDefaultSettingsContent(uri: URI): string | undefined;
+    hasDefaultSettingsContent(uri: URI): boolean;
     createSettings2EditorModel(): Settings2EditorModel;
     openRawDefaultSettings(): Promise<IEditorPane | undefined>;
     openSettings(options?: IOpenSettingsOptions): Promise<IEditorPane | undefined>;
@@ -29,6 +31,7 @@ interface IPreferencesService {
     openDefaultKeybindingsFile(): Promise<IEditorPane | undefined>;
     openLanguageSpecificSettings(languageId: string, options?: IOpenSettingsOptions): Promise<IEditorPane | undefined>;
     getEditableSettingsURI(configurationTarget: ConfigurationTarget, resource?: URI): Promise<URI | null>;
+    getSetting(settingId: string): ISetting | undefined;
     createSplitJsonEditorInput(configurationTarget: ConfigurationTarget, resource: URI): EditorInput;
 }
 

package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js

@@ -2,13 +2,12 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { URI } from '../../../../base/common/uri.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IPreferencesService } from './preferences.service.js';
 var SettingsEditor2Input_1;
-const _moduleId = "vs/workbench/services/preferences/common/preferencesEditorInput";
-const SettingsEditorIcon = registerIcon('settings-editor-label-icon', Codicon.settings, ( localizeWithPath(_moduleId, 0, 'Icon of the settings editor label.')));
+const SettingsEditorIcon = registerIcon('settings-editor-label-icon', Codicon.settings, ( localize(6232, 'Icon of the settings editor label.')));
 let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
     static { SettingsEditor2Input_1 = this; }
     static { this.ID = 'workbench.input.settings2'; }
@@ -27,7 +26,7 @@ let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
         return SettingsEditor2Input_1.ID;
     }
     getName() {
-        return ( localizeWithPath(_moduleId, 1, "Settings"));
+        return ( localize(6233, "Settings"));
     }
     getIcon() {
         return SettingsEditorIcon;