@codingame/monaco-vscode-api 13.1.6 → 14.0.0

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

@@ -1,12 +1,19 @@
 import { Event } from "../../../../base/common/event.js";
-import { IOutputChannel, IOutputChannelDescriptor } from "./output.js";
+import { LogLevel } from "../../../../platform/log/common/log.js";
+import { IOutputViewFilters, IOutputChannel, IOutputChannelDescriptor } from "./output.js";
 export declare const IOutputService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IOutputService>;
 export interface IOutputService {
     readonly _serviceBrand: undefined;
+    readonly filters: IOutputViewFilters;
     getChannel(id: string): IOutputChannel | undefined;
     getChannelDescriptor(id: string): IOutputChannelDescriptor | undefined;
     getChannelDescriptors(): IOutputChannelDescriptor[];
     getActiveChannel(): IOutputChannel | undefined;
     showChannel(id: string, preserveFocus?: boolean): Promise<void>;
     onActiveOutputChannel: Event<string>;
+    registerCompoundLogChannel(channels: IOutputChannelDescriptor[]): string;
+    saveOutputAs(...channels: IOutputChannelDescriptor[]): Promise<void>;
+    canSetLogLevel(channel: IOutputChannelDescriptor): boolean;
+    getLogLevel(channel: IOutputChannelDescriptor): LogLevel | undefined;
+    setLogLevel(channel: IOutputChannelDescriptor, logLevel: LogLevel): void;
 }

package/vscode/src/vs/workbench/services/panecomposite/browser/panecomposite.service.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "../../../../base/common/event.js";
 import { IProgressIndicator } from "../../../../platform/progress/common/progress.js";
-import { PaneCompositeDescriptor } from "@codingame/monaco-vscode-b8988f79-16c1-5bff-b0e7-699bab3431da-common/vscode/vs/workbench/browser/panecomposite";
+import { PaneCompositeDescriptor } from "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common/vscode/vs/workbench/browser/panecomposite";
 import { IPaneComposite } from "../../../common/panecomposite.js";
 import { ViewContainerLocation } from "../../../common/views.js";
 export declare const IPaneCompositePartService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPaneCompositePartService>;

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

@@ -3,7 +3,7 @@ import { URI } from "../../../../base/common/uri.js";
 import { ConfigurationTarget } from "../../../../platform/configuration/common/configuration.js";
 import { IEditorPane } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
-import { IPreferencesEditorModel, ISetting, IOpenSettingsOptions, IKeybindingsEditorOptions } from "@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/services/preferences/common/preferences";
+import { IPreferencesEditorModel, ISetting, IOpenSettingsOptions, IOpenKeybindingsEditorOptions } from "@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/services/preferences/common/preferences";
 import { Settings2EditorModel } from "@codingame/monaco-vscode-preferences-service-override/vscode/vs/workbench/services/preferences/common/preferencesModels";
 export declare const IPreferencesService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPreferencesService>;
 export interface IPreferencesService {
@@ -25,7 +25,7 @@ export interface IPreferencesService {
     openFolderSettings(options: IOpenSettingsOptions & {
         folderUri: IOpenSettingsOptions["folderUri"];
     }): Promise<IEditorPane | undefined>;
-    openGlobalKeybindingSettings(textual: boolean, options?: IKeybindingsEditorOptions): Promise<void>;
+    openGlobalKeybindingSettings(textual: boolean, options?: IOpenKeybindingsEditorOptions): Promise<void>;
     openDefaultKeybindingsFile(): Promise<IEditorPane | undefined>;
     openLanguageSpecificSettings(languageId: string, options?: IOpenSettingsOptions): Promise<IEditorPane | undefined>;
     getEditableSettingsURI(configurationTarget: ConfigurationTarget, resource?: URI): Promise<URI | null>;

package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js

@@ -38,7 +38,7 @@ const getStartedWalkthrough = {
     required: ['id'],
     properties: {
         id: {
-            description: ( localize(11733, 'The ID of a Get Started walkthrough to open.')),
+            description: ( localize(11951, 'The ID of a Get Started walkthrough to open.')),
             type: 'string'
         },
     }
@@ -46,12 +46,12 @@ const getStartedWalkthrough = {
 const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'remoteHelp',
     jsonSchema: {
-        description: ( localize(11734, 'Contributes help information for Remote')),
+        description: ( localize(11952, 'Contributes help information for Remote')),
         type: 'object',
         properties: {
             'getStarted': {
                 description: ( localize(
-                    11735,
+                    11953,
                     "The url, or a command that returns the url, to your project's Getting Started page, or a walkthrough ID contributed by your project's extension"
                 )),
                 oneOf: [
@@ -61,29 +61,29 @@ const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
             },
             'documentation': {
                 description: ( localize(
-                    11736,
+                    11954,
                     "The url, or a command that returns the url, to your project's documentation page"
                 )),
                 type: 'string'
             },
             'feedback': {
                 description: ( localize(
-                    11737,
+                    11955,
                     "The url, or a command that returns the url, to your project's feedback reporter"
                 )),
                 type: 'string',
-                markdownDeprecationMessage: ( localize(11738, "Use {0} instead", '`reportIssue`'))
+                markdownDeprecationMessage: ( localize(11956, "Use {0} instead", '`reportIssue`'))
             },
             'reportIssue': {
                 description: ( localize(
-                    11739,
+                    11957,
                     "The url, or a command that returns the url, to your project's issue reporter"
                 )),
                 type: 'string'
             },
             'issues': {
                 description: ( localize(
-                    11740,
+                    11958,
                     "The url, or a command that returns the url, to your project's issues list"
                 )),
                 type: 'string'

package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js

@@ -28,8 +28,8 @@ const TUNNELS_TO_RESTORE = 'remote.tunnels.toRestore';
 const TUNNELS_TO_RESTORE_EXPIRATION = 'remote.tunnels.toRestoreExpiration';
 const RESTORE_EXPIRATION_TIME = 1000 * 60 * 60 * 24 * 14;
 const ACTIVATION_EVENT = 'onTunnel';
-const forwardedPortsFeaturesEnabled = ( new RawContextKey('forwardedPortsViewEnabled', false, ( localize(11741, "Whether the Ports view is enabled."))));
-const forwardedPortsViewEnabled = ( new RawContextKey('forwardedPortsViewOnlyEnabled', false, ( localize(11741, "Whether the Ports view is enabled."))));
+const forwardedPortsFeaturesEnabled = ( new RawContextKey('forwardedPortsViewEnabled', false, ( localize(11959, "Whether the Ports view is enabled."))));
+const forwardedPortsViewEnabled = ( new RawContextKey('forwardedPortsViewOnlyEnabled', false, ( localize(11959, "Whether the Ports view is enabled."))));
 function parseAddress(address) {
     const matches = address.match(/^([a-zA-Z0-9_-]+(?:\.[a-zA-Z0-9_-]+)*:)?([0-9]+)$/);
     if (!matches) {
@@ -51,11 +51,11 @@ var TunnelSource;
 })(TunnelSource || (TunnelSource = {}));
 const UserTunnelSource = {
     source: TunnelSource.User,
-    description: ( localize(11742, "User Forwarded"))
+    description: ( localize(11960, "User Forwarded"))
 };
 const AutoTunnelSource = {
     source: TunnelSource.Auto,
-    description: ( localize(11743, "Auto Forwarded"))
+    description: ( localize(11961, "Auto Forwarded"))
 };
 function mapHasAddress(map, host, port) {
     const initialAddress = map.get(makeAddress(host, port));
@@ -569,7 +569,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         }
         this.mismatchCooldown = newCooldown;
         const mismatchString = ( localize(
-            11744,
+            11962,
             "Local port {0} could not be used for forwarding to remote port {1}.\n\nThis usually happens when there is already another process using local port {0}.\n\nPort number {2} has been used instead.",
             expectedLocal,
             tunnel.tunnelRemotePort,
@@ -736,7 +736,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                     privacy: TunnelPrivacyId.ConstantPrivate,
                     source: {
                         source: TunnelSource.Extension,
-                        description: ( localize(11745, "Statically Forwarded"))
+                        description: ( localize(11963, "Statically Forwarded"))
                     }
                 });
                 this.tunnelService.setEnvironmentTunnel(tunnel.remoteAddress.host, tunnel.remoteAddress.port, localAddress, TunnelPrivacyId.ConstantPrivate, TunnelProtocol.Http);

package/vscode/src/vs/workbench/services/search/common/queryBuilder.js

@@ -354,7 +354,7 @@ let QueryBuilder = class QueryBuilder {
             else {
                 const probableWorkspaceFolderNameMatch = searchPath.match(/\.[\/\\](.+)[\/\\]?/);
                 const probableWorkspaceFolderName = probableWorkspaceFolderNameMatch ? probableWorkspaceFolderNameMatch[1] : searchPath;
-                const searchPathNotFoundError = ( localize(11748, "Workspace folder does not exist: {0}", probableWorkspaceFolderName));
+                const searchPathNotFoundError = ( localize(11967, "Workspace folder does not exist: {0}", probableWorkspaceFolderName));
                 throw ( new Error(searchPathNotFoundError));
             }
         }

package/vscode/src/vs/workbench/services/statusbar/browser/statusbar.d.ts

@@ -2,6 +2,7 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { ThemeColor } from "../../../../base/common/themables.js";
 import { Command } from "../../../../editor/common/languages.js";
 import { IMarkdownString } from "../../../../base/common/htmlContent.js";
+import { IManagedHoverTooltipMarkdownString } from "../../../../base/browser/ui/hover/hover.js";
 import { ColorIdentifier } from "../../../../platform/theme/common/colorRegistry.js";
 export declare enum StatusbarAlignment {
     LEFT = 0,
@@ -27,12 +28,18 @@ export interface IStatusbarStyleOverride {
 }
 export type StatusbarEntryKind = "standard" | "warning" | "error" | "prominent" | "remote" | "offline";
 export declare const StatusbarEntryKinds: StatusbarEntryKind[];
+export type TooltipContent = string | IMarkdownString | IManagedHoverTooltipMarkdownString | HTMLElement;
+export interface ITooltipWithCommands {
+    readonly content: TooltipContent;
+    readonly commands: Command[];
+}
+export declare function isTooltipWithCommands(thing: unknown): thing is ITooltipWithCommands;
 export interface IStatusbarEntry {
     readonly name: string;
     readonly text: string;
     readonly ariaLabel: string;
     readonly role?: string;
-    readonly tooltip?: string | IMarkdownString | HTMLElement;
+    readonly tooltip?: TooltipContent | ITooltipWithCommands;
     readonly color?: string | ThemeColor;
     readonly backgroundColor?: string | ThemeColor;
     readonly command?: string | Command | typeof ShowTooltipCommand;
@@ -40,10 +47,8 @@ export interface IStatusbarEntry {
     readonly showProgress?: boolean | "loading" | "syncing";
     readonly kind?: StatusbarEntryKind;
     readonly showInAllWindows?: boolean;
+    readonly extensionId?: string;
 }
 export interface IStatusbarEntryAccessor extends IDisposable {
     update(properties: IStatusbarEntry): void;
 }
-export interface IStatusbarEntryOverride {
-    readonly kind?: StatusbarEntryKind;
-}

package/vscode/src/vs/workbench/services/statusbar/browser/statusbar.js

@@ -18,5 +18,9 @@ const ShowTooltipCommand = {
     title: ''
 };
 const StatusbarEntryKinds = ['standard', 'warning', 'error', 'prominent', 'remote', 'offline'];
+function isTooltipWithCommands(thing) {
+    const candidate = thing;
+    return !!candidate?.content && Array.isArray(candidate?.commands);
+}
 
-export { ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKinds, isStatusbarEntryLocation, isStatusbarEntryPriority };
+export { ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKinds, isStatusbarEntryLocation, isStatusbarEntryPriority, isTooltipWithCommands };

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

@@ -7,7 +7,7 @@ import { IFileStatWithMetadata } from "../../../../platform/files/common/files.j
 import { IRevertOptions } from "../../../common/editor.js";
 import { IUntitledTextEditorModelManager } from "@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/services/untitled/common/untitledTextEditorService";
 import { IFileOperationUndoRedoInfo } from "@codingame/monaco-vscode-base-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService";
-import { ITextFileEditorModelManager, IResourceEncodings, ITextFileSaveOptions, ITextFileSaveAsOptions, IReadTextFileOptions, ITextFileContent, ITextFileStreamContent, IWriteTextFileOptions, IReadTextFileEncodingOptions } from "./textfiles.js";
+import { ITextFileEditorModelManager, IResourceEncodings, ITextFileSaveOptions, ITextFileSaveAsOptions, IReadTextFileOptions, ITextFileContent, ITextFileStreamContent, IWriteTextFileOptions, IReadTextFileEncodingOptions } from "@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common/vscode/vs/workbench/services/textfile/common/textfiles";
 export declare const ITextFileService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITextFileService>;
 export interface ITextFileService extends IDisposable {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js

@@ -28,30 +28,30 @@ const colorIdPattern = '^\\w+[.\\w+]*$';
 const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'colors',
     jsonSchema: {
-        description: ( localize(11808, 'Contributes extension defined themable colors')),
+        description: ( localize(12032, 'Contributes extension defined themable colors')),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
                     type: 'string',
-                    description: ( localize(11809, 'The identifier of the themable color')),
+                    description: ( localize(12033, 'The identifier of the themable color')),
                     pattern: colorIdPattern,
                     patternErrorMessage: ( localize(
-                        11810,
+                        12034,
                         'Identifiers must only contain letters, digits and dots and can not start with a dot'
                     )),
                 },
                 description: {
                     type: 'string',
-                    description: ( localize(11811, 'The description of the themable color')),
+                    description: ( localize(12035, 'The description of the themable color')),
                 },
                 defaults: {
                     type: 'object',
                     properties: {
                         light: {
                             description: ( localize(
-                                11812,
+                                12036,
                                 'The default color for light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default.'
                             )),
                             type: 'string',
@@ -62,7 +62,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         dark: {
                             description: ( localize(
-                                11813,
+                                12037,
                                 'The default color for dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default.'
                             )),
                             type: 'string',
@@ -73,7 +73,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         highContrast: {
                             description: ( localize(
-                                11814,
+                                12038,
                                 'The default color for high contrast dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `dark` color is used as default for high contrast dark themes.'
                             )),
                             type: 'string',
@@ -84,7 +84,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         highContrastLight: {
                             description: ( localize(
-                                11815,
+                                12039,
                                 'The default color for high contrast light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `light` color is used as default for high contrast light themes.'
                             )),
                             type: 'string',
@@ -107,7 +107,7 @@ class ColorExtensionPoint {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(11816, "'configuration.colors' must be a array")));
+                    collector.error(( localize(12040, "'configuration.colors' must be a array")));
                     return;
                 }
                 const parseColorValue = (s, name) => {
@@ -120,7 +120,7 @@ class ColorExtensionPoint {
                         }
                     }
                     collector.error(( localize(
-                        11817,
+                        12041,
                         "{0} must be either a color value in hex (#RRGGBB[AA] or #RGB[A]) or the identifier of a themable color which provides the default.",
                         name
                     )));
@@ -128,19 +128,19 @@ class ColorExtensionPoint {
                 };
                 for (const colorContribution of extensionValue) {
                     if (typeof colorContribution.id !== 'string' || colorContribution.id.length === 0) {
-                        collector.error(( localize(11818, "'configuration.colors.id' must be defined and can not be empty")));
+                        collector.error(( localize(12042, "'configuration.colors.id' must be defined and can not be empty")));
                         return;
                     }
                     if (!colorContribution.id.match(colorIdPattern)) {
                         collector.error(( localize(
-                            11819,
+                            12043,
                             "'configuration.colors.id' must only contain letters, digits and dots and can not start with a dot"
                         )));
                         return;
                     }
                     if (typeof colorContribution.description !== 'string' || colorContribution.id.length === 0) {
                         collector.error(( localize(
-                            11820,
+                            12044,
                             "'configuration.colors.description' must be defined and can not be empty"
                         )));
                         return;
@@ -148,21 +148,21 @@ class ColorExtensionPoint {
                     const defaults = colorContribution.defaults;
                     if (!defaults || typeof defaults !== 'object' || typeof defaults.light !== 'string' || typeof defaults.dark !== 'string') {
                         collector.error(( localize(
-                            11821,
+                            12045,
                             "'configuration.colors.defaults' must be defined and must contain 'light' and 'dark'"
                         )));
                         return;
                     }
                     if (defaults.highContrast && typeof defaults.highContrast !== 'string') {
                         collector.error(( localize(
-                            11822,
+                            12046,
                             "If defined, 'configuration.colors.defaults.highContrast' must be a string."
                         )));
                         return;
                     }
                     if (defaults.highContrastLight && typeof defaults.highContrastLight !== 'string') {
                         collector.error(( localize(
-                            11823,
+                            12047,
                             "If defined, 'configuration.colors.defaults.highContrastLight' must be a string."
                         )));
                         return;
@@ -198,11 +198,11 @@ class ColorDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(11824, "ID")),
-            ( localize(11825, "Description")),
-            ( localize(11826, "Dark Default")),
-            ( localize(11827, "Light Default")),
-            ( localize(11828, "High Contrast Default")),
+            ( localize(12048, "ID")),
+            ( localize(12049, "Description")),
+            ( localize(12050, "Dark Default")),
+            ( localize(12051, "Light Default")),
+            ( localize(12052, "High Contrast Default")),
         ];
         const toColor = (colorReference) => colorReference[0] === '#' ? ( Color.fromHex(colorReference)) : undefined;
         const rows = ( colors.sort((a, b) => a.id.localeCompare(b.id))
@@ -226,7 +226,7 @@ class ColorDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions$1.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'colors',
-    label: ( localize(11829, "Colors")),
+    label: ( localize(12053, "Colors")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js

@@ -7,7 +7,6 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { joinPath, isEqualOrParent } from '../../../../base/common/resources.js';
 import { extname, posix } from '../../../../base/common/path.js';
-import { fontCharacterRegex } from './productIconThemeSchema.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
@@ -17,13 +16,13 @@ const iconIdPattern = `^${ThemeIcon.iconNameSegment}(-${ThemeIcon.iconNameSegmen
 const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'icons',
     jsonSchema: {
-        description: ( localize(11890, 'Contributes extension defined themable icons')),
+        description: ( localize(12112, 'Contributes extension defined themable icons')),
         type: 'object',
         propertyNames: {
             pattern: iconIdPattern,
-            description: ( localize(11891, 'The identifier of the themable icon')),
+            description: ( localize(12113, 'The identifier of the themable icon')),
             patternErrorMessage: ( localize(
-                11892,
+                12114,
                 'Identifiers can only contain letters, digits and minuses and need to consist of at least two segments in the form `component-iconname`.'
             )),
         },
@@ -32,7 +31,7 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 description: {
                     type: 'string',
-                    description: ( localize(11893, 'The description of the themable icon')),
+                    description: ( localize(12115, 'The description of the themable icon')),
                 },
                 default: {
                     anyOf: [
@@ -41,17 +40,12 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                             type: 'object',
                             properties: {
                                 fontPath: {
-                                    description: ( localize(11894, 'The path of the icon font that defines the icon.')),
+                                    description: ( localize(12116, 'The path of the icon font that defines the icon.')),
                                     type: 'string'
                                 },
                                 fontCharacter: {
-                                    description: ( localize(11895, 'The character for the icon in the icon font.')),
-                                    type: 'string',
-                                    pattern: fontCharacterRegex,
-                                    patternErrorMessage: ( localize(
-                                        11896,
-                                        'The fontCharacter must be a single letter or a backslash followed by unicode code points in hexadecimal.'
-                                    ))
+                                    description: ( localize(12117, 'The character for the icon in the icon font.')),
+                                    type: 'string'
                                 }
                             },
                             required: ['fontPath', 'fontCharacter'],
@@ -59,8 +53,8 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         }
                     ],
                     description: ( localize(
-                        11897,
-                        'The default of the icon. Either a reference to an extisting ThemeIcon or an icon in an icon font.'
+                        12118,
+                        'The default of the icon. Either a reference to an existing ThemeIcon or an icon in an icon font.'
                     )),
                 }
             },
@@ -78,7 +72,7 @@ class IconExtensionPoint {
                 const collector = extension.collector;
                 if (!extensionValue || typeof extensionValue !== 'object') {
                     collector.error(( localize(
-                        11898,
+                        12119,
                         "'configuration.icons' must be an object with the icon names as properties."
                     )));
                     return;
@@ -86,7 +80,7 @@ class IconExtensionPoint {
                 for (const id in extensionValue) {
                     if (!id.match(iconIdPattern)) {
                         collector.error(( localize(
-                            11899,
+                            12120,
                             "'configuration.icons' keys represent the icon id and can only contain letter, digits and minuses. They need to consist of at least two segments in the form `component-iconname`."
                         )));
                         return;
@@ -94,7 +88,7 @@ class IconExtensionPoint {
                     const iconContribution = extensionValue[id];
                     if (typeof iconContribution.description !== 'string' || iconContribution.description.length === 0) {
                         collector.error(( localize(
-                            11900,
+                            12121,
                             "'configuration.icons.description' must be defined and can not be empty"
                         )));
                         return;
@@ -108,7 +102,7 @@ class IconExtensionPoint {
                         const format = formatMap[fileExt];
                         if (!format) {
                             collector.warn(( localize(
-                                11901,
+                                12122,
                                 "Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.",
                                 fileExt
                             )));
@@ -120,7 +114,7 @@ class IconExtensionPoint {
                         const definition = iconRegistry.registerIconFont(fontId, { src: [{ location: iconFontLocation, format }] });
                         if (!isEqualOrParent(iconFontLocation, extensionLocation)) {
                             collector.warn(( localize(
-                                11902,
+                                12123,
                                 "Expected `contributes.icons.default.fontPath` ({0}) to be included inside extension's folder ({0}).",
                                 iconFontLocation.path,
                                 extensionLocation.path
@@ -137,7 +131,7 @@ class IconExtensionPoint {
                     }
                     else {
                         collector.error(( localize(
-                            11903,
+                            12124,
                             "'configuration.icons.default' must be either a reference to the id of an other theme icon (string) or a icon definition (object) with properties `fontPath` and `fontCharacter`."
                         )));
                     }

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

@@ -1,5 +1,24 @@
-import { IUntitledTextEditorModelManager } from "@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/services/untitled/common/untitledTextEditorService";
+import { Event } from "../../../../base/common/event.js";
+import { URI } from "../../../../base/common/uri.js";
+import { IUntitledTextEditorModel } from "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorModel";
+import { IUntitledTextEditorModelSaveEvent, INewUntitledTextEditorOptions, INewUntitledTextEditorWithAssociatedResourceOptions, IExistingUntitledTextEditorOptions } from "@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/services/untitled/common/untitledTextEditorService";
 export declare const IUntitledTextEditorService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IUntitledTextEditorService>;
-export interface IUntitledTextEditorService extends IUntitledTextEditorModelManager {
+export interface IUntitledTextEditorService {
     readonly _serviceBrand: undefined;
+    readonly onDidSave: Event<IUntitledTextEditorModelSaveEvent>;
+    readonly onDidChangeDirty: Event<IUntitledTextEditorModel>;
+    readonly onDidChangeEncoding: Event<IUntitledTextEditorModel>;
+    readonly onDidChangeLabel: Event<IUntitledTextEditorModel>;
+    readonly onDidCreate: Event<IUntitledTextEditorModel>;
+    readonly onWillDispose: Event<IUntitledTextEditorModel>;
+    create(options?: INewUntitledTextEditorOptions): IUntitledTextEditorModel;
+    create(options?: INewUntitledTextEditorWithAssociatedResourceOptions): IUntitledTextEditorModel;
+    create(options?: IExistingUntitledTextEditorOptions): IUntitledTextEditorModel;
+    get(resource: URI): IUntitledTextEditorModel | undefined;
+    getValue(resource: URI): string | undefined;
+    resolve(options?: INewUntitledTextEditorOptions): Promise<IUntitledTextEditorModel>;
+    resolve(options?: INewUntitledTextEditorWithAssociatedResourceOptions): Promise<IUntitledTextEditorModel>;
+    resolve(options?: IExistingUntitledTextEditorOptions): Promise<IUntitledTextEditorModel>;
+    isUntitledWithAssociatedResource(resource: URI): boolean;
+    canDispose(model: IUntitledTextEditorModel): true | Promise<true>;
 }

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

@@ -1,9 +1,9 @@
-import { Event } from "../../../../base/common/event.js";
-import { IUserDataProfile, type IUserDataProfileOptions, type IUserDataProfileUpdateOptions, type ProfileResourceTypeFlags } from "../../../../platform/userDataProfile/common/userDataProfile.js";
-import { DidChangeUserDataProfileEvent, type IProfileTemplateInfo, type IUserDataProfileContentHandler, type IUserDataProfileCreateOptions, type IUserDataProfileTemplate } from "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common/vscode/vs/workbench/services/userDataProfile/common/userDataProfile";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
+import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
+import { IUserDataProfile, type IUserDataProfileOptions, type IUserDataProfileUpdateOptions, type ProfileResourceTypeFlags } from "../../../../platform/userDataProfile/common/userDataProfile.js";
+import { DidChangeUserDataProfileEvent, type IProfileTemplateInfo, type IUserDataProfileContentHandler, type IUserDataProfileCreateOptions, type IUserDataProfileTemplate } from "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common/vscode/vs/workbench/services/userDataProfile/common/userDataProfile";
 export declare const IUserDataProfileService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IUserDataProfileService>;
 export interface IUserDataProfileService {
     readonly _serviceBrand: undefined;

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

@@ -8,14 +8,14 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 
 function getSyncAreaLabel(source) {
     switch (source) {
-        case SyncResource.Settings: return localize(12072, "Settings");
-        case SyncResource.Keybindings: return localize(12073, "Keyboard Shortcuts");
-        case SyncResource.Snippets: return localize(12074, "Snippets");
-        case SyncResource.Tasks: return localize(12075, "Tasks");
-        case SyncResource.Extensions: return localize(12076, "Extensions");
-        case SyncResource.GlobalState: return localize(12077, "UI State");
-        case SyncResource.Profiles: return localize(12078, "Profiles");
-        case SyncResource.WorkspaceState: return localize(12079, "Workspace State");
+        case SyncResource.Settings: return localize(12295, "Settings");
+        case SyncResource.Keybindings: return localize(12296, "Keyboard Shortcuts");
+        case SyncResource.Snippets: return localize(12297, "Snippets");
+        case SyncResource.Tasks: return localize(12298, "Tasks");
+        case SyncResource.Extensions: return localize(12299, "Extensions");
+        case SyncResource.GlobalState: return localize(12300, "UI State");
+        case SyncResource.Profiles: return localize(12301, "Profiles");
+        case SyncResource.WorkspaceState: return localize(12302, "Workspace State");
     }
 }
 var AccountStatus;
@@ -24,8 +24,8 @@ var AccountStatus;
     AccountStatus["Unavailable"] = "unavailable";
     AccountStatus["Available"] = "available";
 })(AccountStatus || (AccountStatus = {}));
-const SYNC_TITLE = ( localize2(12080, "Settings Sync"));
-const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, ( localize(12081, 'View icon of the Settings Sync view.')));
+const SYNC_TITLE = ( localize2(12303, "Settings Sync"));
+const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, ( localize(12304, 'View icon of the Settings Sync view.')));
 const CONTEXT_SYNC_STATE = ( new RawContextKey('syncStatus', SyncStatus.Uninitialized));
 const CONTEXT_SYNC_ENABLEMENT = ( new RawContextKey('syncEnabled', false));
 const CONTEXT_ACCOUNT_STATE = ( new RawContextKey('userDataSyncAccountStatus', AccountStatus.Uninitialized));
@@ -38,7 +38,7 @@ const SYNC_VIEW_CONTAINER_ID = 'workbench.view.sync';
 const SYNC_CONFLICTS_VIEW_ID = 'workbench.views.sync.conflicts';
 const DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR = {
     id: 'workbench.userDataSync.actions.downloadSyncActivity',
-    title: ( localize2(12082, "Download Settings Sync Activity")),
+    title: ( localize2(12305, "Download Settings Sync Activity")),
     category: Categories.Developer,
     f1: true,
     precondition: ( ContextKeyExpr.and(( CONTEXT_ACCOUNT_STATE.isEqualTo(AccountStatus.Available)), ( CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized))))

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackup.d.ts

@@ -1,5 +1,5 @@
 import { VSBufferReadableStream } from "../../../../base/common/buffer.js";
-import { IWorkingCopyBackupMeta } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopyBackupMeta } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 export interface IResolvedWorkingCopyBackup<T extends IWorkingCopyBackupMeta> {
     readonly value: VSBufferReadableStream;
     readonly meta?: T;

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

@@ -1,6 +1,6 @@
 import { VSBufferReadable, VSBufferReadableStream } from "../../../../base/common/buffer.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { IWorkingCopyIdentifier, IWorkingCopyBackupMeta } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopyIdentifier, IWorkingCopyBackupMeta } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { IResolvedWorkingCopyBackup } from "./workingCopyBackup.js";
 export declare const IWorkingCopyBackupService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkingCopyBackupService>;
 export interface IWorkingCopyBackupService {

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

@@ -1,7 +1,7 @@
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IEditorIdentifier } from "../../../common/editor.js";
-import { IWorkingCopy } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopy } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { IWorkingCopyEditorHandler } from "@codingame/monaco-vscode-working-copy-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService";
 export declare const IWorkingCopyEditorService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkingCopyEditorService>;
 export interface IWorkingCopyEditorService {