@codingame/monaco-vscode-api 24.3.0 → 25.0.1

package/vscode/src/vs/platform/extensions/common/extensionValidator.js

@@ -171,16 +171,16 @@ function isValidVersion(_inputVersion, _inputDate, _desiredVersion) {
 function validateExtensionManifest(productVersion, productDate, extensionLocation, extensionManifest, extensionIsBuiltin, validateApiVersion) {
     const validations = [];
     if (typeof extensionManifest.publisher !== 'undefined' && typeof extensionManifest.publisher !== 'string') {
-        validations.push([Severity$1.Error, ( localize(1878, "property publisher must be of type `string`."))]);
+        validations.push([Severity$1.Error, ( localize(1885, "property publisher must be of type `string`."))]);
         return validations;
     }
     if (typeof extensionManifest.name !== 'string') {
-        validations.push([Severity$1.Error, ( localize(1879, "property `{0}` is mandatory and must be of type `string`", 'name'))]);
+        validations.push([Severity$1.Error, ( localize(1886, "property `{0}` is mandatory and must be of type `string`", 'name'))]);
         return validations;
     }
     if (typeof extensionManifest.version !== 'string') {
         validations.push([Severity$1.Error, ( localize(
-            1880,
+            1887,
             "property `{0}` is mandatory and must be of type `string`",
             'version'
         ))]);
@@ -188,7 +188,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (!extensionManifest.engines) {
         validations.push([Severity$1.Error, ( localize(
-            1881,
+            1888,
             "property `{0}` is mandatory and must be of type `object`",
             'engines'
         ))]);
@@ -196,7 +196,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.engines.vscode !== 'string') {
         validations.push([Severity$1.Error, ( localize(
-            1882,
+            1889,
             "property `{0}` is mandatory and must be of type `string`",
             'engines.vscode'
         ))]);
@@ -205,7 +205,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.extensionDependencies !== 'undefined') {
         if (!isStringArray(extensionManifest.extensionDependencies)) {
             validations.push([Severity$1.Error, ( localize(
-                1883,
+                1890,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 'extensionDependencies'
             ))]);
@@ -215,7 +215,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.activationEvents !== 'undefined') {
         if (!isStringArray(extensionManifest.activationEvents)) {
             validations.push([Severity$1.Error, ( localize(
-                1884,
+                1891,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 'activationEvents'
             ))]);
@@ -223,7 +223,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
         }
         if (typeof extensionManifest.main === 'undefined' && typeof extensionManifest.browser === 'undefined') {
             validations.push([Severity$1.Error, ( localize(
-                1885,
+                1892,
                 "property `{0}` should be omitted if the extension doesn't have a `{1}` or `{2}` property.",
                 'activationEvents',
                 'main',
@@ -235,7 +235,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.extensionKind !== 'undefined') {
         if (typeof extensionManifest.main === 'undefined') {
             validations.push([Severity$1.Warning, ( localize(
-                1886,
+                1893,
                 "property `{0}` can be defined only if property `main` is also defined.",
                 'extensionKind'
             ))]);
@@ -243,14 +243,14 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.main !== 'undefined') {
         if (typeof extensionManifest.main !== 'string') {
-            validations.push([Severity$1.Error, ( localize(1887, "property `{0}` can be omitted or must be of type `string`", 'main'))]);
+            validations.push([Severity$1.Error, ( localize(1894, "property `{0}` can be omitted or must be of type `string`", 'main'))]);
             return validations;
         }
         else {
             const mainLocation = joinPath(extensionLocation, extensionManifest.main);
             if (!isEqualOrParent(mainLocation, extensionLocation)) {
                 validations.push([Severity$1.Warning, ( localize(
-                    1888,
+                    1895,
                     "Expected `main` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     mainLocation.path,
                     extensionLocation.path
@@ -261,7 +261,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.browser !== 'undefined') {
         if (typeof extensionManifest.browser !== 'string') {
             validations.push([Severity$1.Error, ( localize(
-                1889,
+                1896,
                 "property `{0}` can be omitted or must be of type `string`",
                 'browser'
             ))]);
@@ -271,7 +271,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
             const browserLocation = joinPath(extensionLocation, extensionManifest.browser);
             if (!isEqualOrParent(browserLocation, extensionLocation)) {
                 validations.push([Severity$1.Warning, ( localize(
-                    1890,
+                    1897,
                     "Expected `browser` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     browserLocation.path,
                     extensionLocation.path
@@ -280,7 +280,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
         }
     }
     if (!semverExports.valid(extensionManifest.version)) {
-        validations.push([Severity$1.Error, ( localize(1891, "Extension version is not semver compatible."))]);
+        validations.push([Severity$1.Error, ( localize(1898, "Extension version is not semver compatible."))]);
         return validations;
     }
     const notices = [];
@@ -330,14 +330,14 @@ function areApiProposalsCompatible(apiProposals, arg1) {
         if (notices) {
             if (incompatibleProposals.length === 1) {
                 notices.push(( localize(
-                    1892,
+                    1899,
                     "This extension is using the API proposal '{0}' that is not compatible with the current version of VS Code.",
                     incompatibleProposals[0]
                 )));
             }
             else {
                 notices.push(( localize(
-                    1893,
+                    1900,
                     "This extension is using the API proposals {0} and '{1}' that are not compatible with the current version of VS Code.",
                     ( incompatibleProposals.slice(0, incompatibleProposals.length - 1).map(p => `'${p}'`)).join(', '),
                     incompatibleProposals[incompatibleProposals.length - 1]
@@ -352,7 +352,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     const desiredVersion = normalizeVersion(parseVersion(requestedVersion));
     if (!desiredVersion) {
         notices.push(( localize(
-            1894,
+            1901,
             "Could not parse `engines.vscode` value {0}. Please use, for example: ^1.22.0, ^1.22.x, etc.",
             requestedVersion
         )));
@@ -361,7 +361,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     if (desiredVersion.majorBase === 0) {
         if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) {
             notices.push(( localize(
-                1895,
+                1902,
                 "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions before 1.0.0, please define at a minimum the major and minor desired version. E.g. ^0.10.0, 0.10.x, 0.11.0, etc.",
                 requestedVersion
             )));
@@ -371,7 +371,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     else {
         if (!desiredVersion.majorMustEqual) {
             notices.push(( localize(
-                1896,
+                1903,
                 "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions after 1.0.0, please define at a minimum the major desired version. E.g. ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.",
                 requestedVersion
             )));
@@ -380,7 +380,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     }
     if (!isValidVersion(currentVersion, date, desiredVersion)) {
         notices.push(( localize(
-            1897,
+            1904,
             "Extension is not compatible with Code {0}. Extension requires: {1}.",
             currentVersion,
             requestedVersion

package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.d.ts

@@ -327,15 +327,9 @@ declare const _allApiProposals: {
     quickInputButtonLocation: {
         proposal: string;
     };
-    quickPickItemResource: {
-        proposal: string;
-    };
     quickPickItemTooltip: {
         proposal: string;
     };
-    quickPickPrompt: {
-        proposal: string;
-    };
     quickPickSortByLabel: {
         proposal: string;
     };

package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js

@@ -329,15 +329,9 @@ const _allApiProposals = {
     quickInputButtonLocation: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts',
     },
-    quickPickItemResource: {
-        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickItemResource.d.ts',
-    },
     quickPickItemTooltip: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts',
     },
-    quickPickPrompt: {
-        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickPrompt.d.ts',
-    },
     quickPickSortByLabel: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts',
     },

package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js

@@ -206,7 +206,7 @@ class HTMLFileSystemProvider extends Disposable {
                 await this.delete(from, { recursive: false, useTrash: false, atomic: false });
             }
             else {
-                throw this.createFileSystemProviderError(from, ( localize(1898, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
+                throw this.createFileSystemProviderError(from, ( localize(1905, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
             }
         }
         catch (error) {
@@ -382,7 +382,7 @@ class HTMLFileSystemProvider extends Disposable {
         }
         let code = FileSystemProviderErrorCode.Unknown;
         if (error.name === 'NotAllowedError') {
-            error = ( new Error(( localize(1899, "Insufficient permissions. Please retry and allow the operation."))));
+            error = ( new Error(( localize(1906, "Insufficient permissions. Please retry and allow the operation."))));
             code = FileSystemProviderErrorCode.Unavailable;
         }
         return createFileSystemProviderError(error, code);

package/vscode/src/vs/platform/files/common/files.d.ts

@@ -173,7 +173,12 @@ export declare enum FilePermission {
      * to edit the contents and ask the user upon saving to
      * remove the lock.
      */
-    Locked = 2
+    Locked = 2,
+    /**
+     * File is executable. Relevant for Unix-like systems where
+     * the executable bit determines if a file can be run.
+     */
+    Executable = 4
 }
 export interface IStat {
     /**
@@ -606,6 +611,11 @@ export interface IBaseFileStat {
      * remove the lock.
      */
     readonly locked?: boolean;
+    /**
+     * File is executable. Relevant for Unix-like systems where
+     * the executable bit determines if a file can be run.
+     */
+    readonly executable?: boolean;
 }
 export interface IBaseFileStatWithMetadata extends Required<IBaseFileStat> {
 }
@@ -640,6 +650,7 @@ export interface IFileStatWithMetadata extends IFileStat, IBaseFileStatWithMetad
     readonly size: number;
     readonly readonly: boolean;
     readonly locked: boolean;
+    readonly executable: boolean;
     readonly children: IFileStatWithMetadata[] | undefined;
 }
 export interface IFileStatResult {

package/vscode/src/vs/platform/files/common/files.js

@@ -20,6 +20,7 @@ var FilePermission;
 (function (FilePermission) {
     FilePermission[FilePermission["Readonly"] = 1] = "Readonly";
     FilePermission[FilePermission["Locked"] = 2] = "Locked";
+    FilePermission[FilePermission["Executable"] = 4] = "Executable";
 })(FilePermission || (FilePermission = {}));
 var FileChangeFilter;
 (function (FileChangeFilter) {
@@ -109,7 +110,7 @@ function createFileSystemProviderError(error, code) {
 }
 function ensureFileSystemProviderError(error) {
     if (!error) {
-        return createFileSystemProviderError(( localize(1932, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
+        return createFileSystemProviderError(( localize(1939, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
     }
     return error;
 }
@@ -378,18 +379,18 @@ class ByteSize {
             size = 0;
         }
         if (size < ByteSize.KB) {
-            return localize(1933, "{0}B", size.toFixed(0));
+            return localize(1940, "{0}B", size.toFixed(0));
         }
         if (size < ByteSize.MB) {
-            return localize(1934, "{0}KB", (size / ByteSize.KB).toFixed(2));
+            return localize(1941, "{0}KB", (size / ByteSize.KB).toFixed(2));
         }
         if (size < ByteSize.GB) {
-            return localize(1935, "{0}MB", (size / ByteSize.MB).toFixed(2));
+            return localize(1942, "{0}MB", (size / ByteSize.MB).toFixed(2));
         }
         if (size < ByteSize.TB) {
-            return localize(1936, "{0}GB", (size / ByteSize.GB).toFixed(2));
+            return localize(1943, "{0}GB", (size / ByteSize.GB).toFixed(2));
         }
-        return localize(1937, "{0}TB", (size / ByteSize.TB).toFixed(2));
+        return localize(1944, "{0}TB", (size / ByteSize.TB).toFixed(2));
     }
 }
 function getLargeFileConfirmationLimit(arg) {

package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js

@@ -11,7 +11,7 @@ import { localize } from '../../../nls.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { isActiveElement } from '../../../base/browser/dom.js';
 
-const historyNavigationVisible = ( new RawContextKey('suggestWidgetVisible', false, ( localize(1939, "Whether suggestion are visible"))));
+const historyNavigationVisible = ( new RawContextKey('suggestWidgetVisible', false, ( localize(1946, "Whether suggestion are visible"))));
 const HistoryNavigationWidgetFocusContext = 'historyNavigationWidgetFocus';
 const HistoryNavigationForwardsEnablementContext = 'historyNavigationForwardsEnabled';
 const HistoryNavigationBackwardsEnablementContext = 'historyNavigationBackwardsEnabled';

package/vscode/src/vs/platform/hover/browser/hoverWidget.js

@@ -181,7 +181,7 @@ let HoverWidget = class HoverWidget extends Widget {
         if (options.appearance?.showHoverHint) {
             const statusBarElement = $('div.hover-row.status-bar');
             const infoElement = $('div.info');
-            infoElement.textContent = ( localize(1940, 'Hold {0} key to mouse over', isMacintosh ? 'Option' : 'Alt'));
+            infoElement.textContent = ( localize(1947, 'Hold {0} key to mouse over', isMacintosh ? 'Option' : 'Alt'));
             statusBarElement.appendChild(infoElement);
             this._hover.containerDomNode.appendChild(statusBarElement);
         }

package/vscode/src/vs/platform/hover/browser/updatableHoverWidget.js

@@ -48,7 +48,7 @@ class ManagedHoverWidget {
             }
             if (managedContent instanceof Promise) {
                 if (!this._hoverWidget) {
-                    this.show(( localize(1941, "Loading...")), focus, options);
+                    this.show(( localize(1948, "Loading...")), focus, options);
                 }
                 resolvedContent = await managedContent;
             }

package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js

@@ -109,7 +109,7 @@ class AbstractKeybindingService extends Disposable {
                 throw illegalState('impossible');
             case 1:
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1942,
+                    1949,
                     "({0}) was pressed. Waiting for second key of chord...",
                     keypressLabel
                 )));
@@ -117,7 +117,7 @@ class AbstractKeybindingService extends Disposable {
             default: {
                 const fullKeypressLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1943,
+                    1950,
                     "({0}) was pressed. Waiting for next key of chord...",
                     fullKeypressLabel
                 )));
@@ -222,7 +222,7 @@ class AbstractKeybindingService extends Disposable {
                     const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                     this._log(`+ Leaving multi-chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                     this._notificationService.status(( localize(
-                        1944,
+                        1951,
                         "The key combination ({0}, {1}) is not a command.",
                         currentChordsLabel,
                         keypressLabel
@@ -246,7 +246,7 @@ class AbstractKeybindingService extends Disposable {
                         const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                         this._log(`+ Leaving chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                         this._notificationService.status(( localize(
-                            1944,
+                            1951,
                             "The key combination ({0}, {1}) is not a command.",
                             currentChordsLabel,
                             keypressLabel

package/vscode/src/vs/platform/languagePacks/common/languagePacks.js

@@ -49,7 +49,7 @@ let LanguagePackBaseService = class LanguagePackBaseService extends Disposable {
         }
         if (locale.toLowerCase() === language.toLowerCase()) {
             description ??= '';
-            description += ( localize(1948, " (Current)"));
+            description += ( localize(1955, " (Current)"));
         }
         if (languagePack?.installCount) {
             description ??= '';

package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js

@@ -1,9 +1,9 @@
 
 import { localize } from '../../../nls.js';
 
-const open = ( localize(1949, 'open'));
-const close = ( localize(1950, 'close'));
-const find = ( localize(1951, 'find'));
+const open = ( localize(1956, 'open'));
+const close = ( localize(1957, 'close'));
+const find = ( localize(1958, 'find'));
 var localizedStrings = {
     open: open,
     close: close,

package/vscode/src/vs/platform/list/browser/listService.js

@@ -948,19 +948,19 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'workbench',
     order: 7,
-    title: ( localize(1952, "Workbench")),
+    title: ( localize(1959, "Workbench")),
     type: 'object',
     properties: {
         [multiSelectModifierSettingKey]: {
             type: 'string',
             enum: ['ctrlCmd', 'alt'],
             markdownEnumDescriptions: [
-                ( localize(1953, "Maps to `Control` on Windows and Linux and to `Command` on macOS.")),
-                ( localize(1954, "Maps to `Alt` on Windows and Linux and to `Option` on macOS."))
+                ( localize(1960, "Maps to `Control` on Windows and Linux and to `Command` on macOS.")),
+                ( localize(1961, "Maps to `Alt` on Windows and Linux and to `Option` on macOS."))
             ],
             default: 'ctrlCmd',
             description: ( localize(
-                1955,
+                1962,
                 "The modifier to be used to add an item in trees and lists to a multi-selection with the mouse (for example in the explorer, open editors and scm view). The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier."
             ))
         },
@@ -969,7 +969,7 @@ configurationRegistry.registerConfiguration({
             enum: ['singleClick', 'doubleClick'],
             default: 'singleClick',
             description: ( localize(
-                1956,
+                1963,
                 "Controls how to open items in trees and lists using the mouse (if supported). Note that some trees and lists might choose to ignore this setting if it is not applicable."
             ))
         },
@@ -977,59 +977,59 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             description: ( localize(
-                1957,
+                1964,
                 "Controls whether lists and trees support horizontal scrolling in the workbench. Warning: turning on this setting has a performance implication."
             ))
         },
         [scrollByPageKey]: {
             type: 'boolean',
             default: false,
-            description: ( localize(1958, "Controls whether clicks in the scrollbar scroll page by page."))
+            description: ( localize(1965, "Controls whether clicks in the scrollbar scroll page by page."))
         },
         [treeIndentKey]: {
             type: 'number',
             default: 8,
             minimum: 4,
             maximum: 40,
-            description: ( localize(1959, "Controls tree indentation in pixels."))
+            description: ( localize(1966, "Controls tree indentation in pixels."))
         },
         [treeRenderIndentGuidesKey]: {
             type: 'string',
             enum: ['none', 'onHover', 'always'],
             default: 'onHover',
-            description: ( localize(1960, "Controls whether the tree should render indent guides."))
+            description: ( localize(1967, "Controls whether the tree should render indent guides."))
         },
         [listSmoothScrolling]: {
             type: 'boolean',
             default: false,
-            description: ( localize(1961, "Controls whether lists and trees have smooth scrolling.")),
+            description: ( localize(1968, "Controls whether lists and trees have smooth scrolling.")),
         },
         [mouseWheelScrollSensitivityKey]: {
             type: 'number',
             default: 1,
             markdownDescription: ( localize(
-                1962,
+                1969,
                 "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events."
             ))
         },
         [fastScrollSensitivityKey]: {
             type: 'number',
             default: 5,
-            markdownDescription: ( localize(1963, "Scrolling speed multiplier when pressing `Alt`."))
+            markdownDescription: ( localize(1970, "Scrolling speed multiplier when pressing `Alt`."))
         },
         [defaultFindModeSettingKey]: {
             type: 'string',
             enum: ['highlight', 'filter'],
             enumDescriptions: [
                 ( localize(
-                1964,
+                1971,
                 "Highlight elements when searching. Further up and down navigation will traverse only the highlighted elements."
             )),
-                ( localize(1965, "Filter elements when searching."))
+                ( localize(1972, "Filter elements when searching."))
             ],
             default: 'highlight',
             description: ( localize(
-                1966,
+                1973,
                 "Controls the default find mode for lists and trees in the workbench."
             ))
         },
@@ -1038,26 +1038,26 @@ configurationRegistry.registerConfiguration({
             enum: ['simple', 'highlight', 'filter'],
             enumDescriptions: [
                 ( localize(
-                1967,
+                1974,
                 "Simple keyboard navigation focuses elements which match the keyboard input. Matching is done only on prefixes."
             )),
                 ( localize(
-                1968,
+                1975,
                 "Highlight keyboard navigation highlights elements which match the keyboard input. Further up and down navigation will traverse only the highlighted elements."
             )),
                 ( localize(
-                1969,
+                1976,
                 "Filter keyboard navigation will filter out and hide all the elements which do not match the keyboard input."
             ))
             ],
             default: 'highlight',
             description: ( localize(
-                1970,
+                1977,
                 "Controls the keyboard navigation style for lists and trees in the workbench. Can be simple, highlight and filter."
             )),
             deprecated: true,
             deprecationMessage: ( localize(
-                1971,
+                1978,
                 "Please use 'workbench.list.defaultFindMode' and	'workbench.list.typeNavigationMode' instead."
             ))
         },
@@ -1065,12 +1065,12 @@ configurationRegistry.registerConfiguration({
             type: 'string',
             enum: ['fuzzy', 'contiguous'],
             enumDescriptions: [
-                ( localize(1972, "Use fuzzy matching when searching.")),
-                ( localize(1973, "Use contiguous matching when searching."))
+                ( localize(1979, "Use fuzzy matching when searching.")),
+                ( localize(1980, "Use contiguous matching when searching."))
             ],
             default: 'fuzzy',
             description: ( localize(
-                1974,
+                1981,
                 "Controls the type of matching used when searching lists and trees in the workbench."
             ))
         },
@@ -1079,21 +1079,21 @@ configurationRegistry.registerConfiguration({
             enum: ['singleClick', 'doubleClick'],
             default: 'singleClick',
             description: ( localize(
-                1975,
+                1982,
                 "Controls how tree folders are expanded when clicking the folder names. Note that some trees and lists might choose to ignore this setting if it is not applicable."
             )),
         },
         [treeStickyScroll]: {
             type: 'boolean',
             default: true,
-            description: ( localize(1976, "Controls whether sticky scrolling is enabled in trees.")),
+            description: ( localize(1983, "Controls whether sticky scrolling is enabled in trees.")),
         },
         [treeStickyScrollMaxElements]: {
             type: 'number',
             minimum: 1,
             default: 7,
             markdownDescription: ( localize(
-                1977,
+                1984,
                 "Controls the number of sticky elements displayed in the tree when {0} is enabled.",
                 '`#workbench.tree.enableStickyScroll#`'
             )),
@@ -1103,7 +1103,7 @@ configurationRegistry.registerConfiguration({
             enum: ['automatic', 'trigger'],
             default: 'automatic',
             markdownDescription: ( localize(
-                1978,
+                1985,
                 "Controls how type navigation works in lists and trees in the workbench. When set to `trigger`, type navigation begins once the `list.triggerTypeNavigation` command is run."
             )),
         }

package/vscode/src/vs/platform/log/common/log.js

@@ -421,12 +421,12 @@ function LogLevelToString(logLevel) {
 }
 function LogLevelToLocalizedString(logLevel) {
     switch (logLevel) {
-        case LogLevel.Trace: return { original: 'Trace', value: ( localize(1979, "Trace")) };
-        case LogLevel.Debug: return { original: 'Debug', value: ( localize(1980, "Debug")) };
-        case LogLevel.Info: return { original: 'Info', value: ( localize(1981, "Info")) };
-        case LogLevel.Warning: return { original: 'Warning', value: ( localize(1982, "Warning")) };
-        case LogLevel.Error: return { original: 'Error', value: ( localize(1983, "Error")) };
-        case LogLevel.Off: return { original: 'Off', value: ( localize(1984, "Off")) };
+        case LogLevel.Trace: return { original: 'Trace', value: ( localize(1986, "Trace")) };
+        case LogLevel.Debug: return { original: 'Debug', value: ( localize(1987, "Debug")) };
+        case LogLevel.Info: return { original: 'Info', value: ( localize(1988, "Info")) };
+        case LogLevel.Warning: return { original: 'Warning', value: ( localize(1989, "Warning")) };
+        case LogLevel.Error: return { original: 'Error', value: ( localize(1990, "Error")) };
+        case LogLevel.Off: return { original: 'Off', value: ( localize(1991, "Off")) };
     }
 }
 function parseLogLevel(logLevel) {

package/vscode/src/vs/platform/markers/common/markerService.js

@@ -1,6 +1,6 @@
 
 import { isFalsyOrEmpty, isNonEmptyArray } from '../../../base/common/arrays.js';
-import { DebounceEmitter } from '../../../base/common/event.js';
+import { MicrotaskEmitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
@@ -126,8 +126,7 @@ class MarkerStats {
 }
 class MarkerService {
     constructor() {
-        this._onMarkerChanged = ( new DebounceEmitter({
-            delay: 0,
+        this._onMarkerChanged = ( new MicrotaskEmitter({
             merge: MarkerService._merge
         }));
         this.onMarkerChanged = this._onMarkerChanged.event;
@@ -190,7 +189,7 @@ class MarkerService {
         });
     }
     static _toMarker(owner, resource, data) {
-        let { code, severity, message, source, startLineNumber, startColumn, endLineNumber, endColumn, relatedInformation, tags, origin } = data;
+        let { code, severity, message, source, startLineNumber, startColumn, endLineNumber, endColumn, relatedInformation, modelVersionId, tags, origin } = data;
         if (!message) {
             return undefined;
         }
@@ -210,6 +209,7 @@ class MarkerService {
             endLineNumber,
             endColumn,
             relatedInformation,
+            modelVersionId,
             tags,
             origin
         };
@@ -252,9 +252,9 @@ class MarkerService {
     }
     _createFilteredMarker(resource, reasons) {
         const message = reasons.length === 1
-            ? ( localize(1985, "Problems are paused because: \"{0}\"", reasons[0]))
+            ? ( localize(1992, "Problems are paused because: \"{0}\"", reasons[0]))
             : ( localize(
-            1986,
+            1993,
             "Problems are paused because: \"{0}\" and {1} more",
             reasons[0],
             reasons.length - 1