@codingame/monaco-vscode-api 15.0.2 → 16.0.0

package/vscode/src/vs/platform/quickinput/browser/quickInput.js

@@ -12,7 +12,7 @@ import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { isIOS } from '../../../base/common/platform.js';
 import Severity$1 from '../../../base/common/severity.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
-import './media/quickInput.css.js';
+import './media/quickInput.css';
 import { localize } from '../../../nls.js';
 import { QuickInputButtonLocation, QuickInputHideReason, ItemActivation, QuickInputType, NO_KEY_MODS, QuickPickFocus } from '../common/quickInput.js';
 import { quickInputButtonToAction, renderQuickInputDescription } from './quickInputUtils.js';
@@ -22,25 +22,25 @@ import { IHoverService } from '../../hover/browser/hover.service.js';
 import { RawContextKey, ContextKeyExpr } from '../../contextkey/common/contextkey.js';
 
 const inQuickInputContextKeyValue = 'inQuickInput';
-const InQuickInputContextKey = ( new RawContextKey(inQuickInputContextKeyValue, false, ( localize(1891, "Whether keyboard focus is inside the quick input control"))));
+const InQuickInputContextKey = ( new RawContextKey(inQuickInputContextKeyValue, false, ( localize(1928, "Whether keyboard focus is inside the quick input control"))));
 const inQuickInputContext = ( ContextKeyExpr.has(inQuickInputContextKeyValue));
 const quickInputAlignmentContextKeyValue = 'quickInputAlignment';
-const QuickInputAlignmentContextKey = ( new RawContextKey(quickInputAlignmentContextKeyValue, 'top', ( localize(1892, "The alignment of the quick input"))));
+const QuickInputAlignmentContextKey = ( new RawContextKey(quickInputAlignmentContextKeyValue, 'top', ( localize(1929, "The alignment of the quick input"))));
 const quickInputTypeContextKeyValue = 'quickInputType';
-const QuickInputTypeContextKey = ( new RawContextKey(quickInputTypeContextKeyValue, undefined, ( localize(1893, "The type of the currently visible quick input"))));
+const QuickInputTypeContextKey = ( new RawContextKey(quickInputTypeContextKeyValue, undefined, ( localize(1930, "The type of the currently visible quick input"))));
 const endOfQuickInputBoxContextKeyValue = 'cursorAtEndOfQuickInputBox';
 const EndOfQuickInputBoxContextKey = ( new RawContextKey(endOfQuickInputBoxContextKeyValue, false, ( localize(
-    1894,
+    1931,
     "Whether the cursor in the quick input is at the end of the input box"
 ))));
 const endOfQuickInputBoxContext = ( ContextKeyExpr.has(endOfQuickInputBoxContextKeyValue));
 const backButton = {
     iconClass: ThemeIcon.asClassName(Codicon.quickInputBack),
-    tooltip: ( localize(1895, "Back")),
+    tooltip: ( localize(1932, "Back")),
     handle: -1
 };
 class QuickInput extends Disposable {
-    static { this.noPromptMessage = ( localize(1896, "Press 'Enter' to confirm your input or 'Escape' to cancel")); }
+    static { this.noPromptMessage = ( localize(1933, "Press 'Enter' to confirm your input or 'Escape' to cancel")); }
     constructor(ui) {
         super();
         this.ui = ui;
@@ -317,7 +317,7 @@ class QuickInput extends Disposable {
     }
     getSteps() {
         if (this.step && this.totalSteps) {
-            return localize(1897, "{0}/{1}", this.step, this.totalSteps);
+            return localize(1934, "{0}/{1}", this.step, this.totalSteps);
         }
         if (this.step) {
             return String(this.step);
@@ -390,7 +390,7 @@ class QuickPick extends QuickInput {
         this.onDidTriggerItemButton = this.onDidTriggerItemButtonEmitter.event;
         this.onDidTriggerSeparatorButton = this.onDidTriggerSeparatorButtonEmitter.event;
     }
-    static { this.DEFAULT_ARIA_LABEL = ( localize(1898, "Type to narrow down results.")); }
+    static { this.DEFAULT_ARIA_LABEL = ( localize(1935, "Type to narrow down results.")); }
     get quickNavigate() {
         return this._quickNavigate;
     }
@@ -570,7 +570,7 @@ class QuickPick extends QuickInput {
         this.update();
     }
     get okLabel() {
-        return this._okLabel ?? ( localize(1899, "OK"));
+        return this._okLabel ?? ( localize(1936, "OK"));
     }
     set okLabel(okLabel) {
         this._okLabel = okLabel;
@@ -641,7 +641,7 @@ class QuickPick extends QuickInput {
                 this.onDidChangeActiveEmitter.fire(focusedItems);
             }));
             this.visibleDisposables.add(this.ui.list.onDidChangeSelection(({ items: selectedItems, event }) => {
-                if (this.canSelectMany) {
+                if (this.canSelectMany && !( selectedItems.some(i => i.pickable === false))) {
                     if (selectedItems.length) {
                         this.ui.list.setSelectedElements([]);
                     }
@@ -901,7 +901,7 @@ class InputBox extends QuickInput {
     set prompt(prompt) {
         this._prompt = prompt;
         this.noValidationMessage = prompt
-            ? ( localize(1900, "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", prompt))
+            ? ( localize(1937, "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", prompt))
             : QuickInput.noPromptMessage;
         this.update();
     }

package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js

@@ -13,7 +13,7 @@ const defaultCommandAndKeybindingRule = {
     weight: KeybindingWeight.WorkbenchContrib,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickPick)), inQuickInputContext)),
     metadata: { description: ( localize(
-        1901,
+        1938,
         "Used while in the context of the quick pick. If you change one keybinding for this command, you should change all of the other keybindings (modifier variants) of this command as well."
     )) }
 };
@@ -68,11 +68,11 @@ registerQuickPickCommandAndKeybindingRule({ id: 'quickInput.last', primary: ctrl
 registerQuickPickCommandAndKeybindingRule({ id: 'quickInput.next', primary: KeyCode.DownArrow, handler: focusHandler(QuickPickFocus.Next) }, { withCtrlMod: true });
 registerQuickPickCommandAndKeybindingRule({ id: 'quickInput.previous', primary: KeyCode.UpArrow, handler: focusHandler(QuickPickFocus.Previous) }, { withCtrlMod: true });
 const nextSeparatorFallbackDesc = ( localize(
-    1902,
+    1939,
     "If we're in quick access mode, this will navigate to the next item. If we are not in quick access mode, this will navigate to the next separator."
 ));
 const prevSeparatorFallbackDesc = ( localize(
-    1903,
+    1940,
     "If we're in quick access mode, this will navigate to the previous item. If we are not in quick access mode, this will navigate to the previous separator."
 ));
 if (isMacintosh) {

package/vscode/src/vs/platform/quickinput/browser/quickInputBox.js

@@ -4,7 +4,7 @@ import { FindInput } from '../../../base/browser/ui/findinput/findInput.js';
 import { MessageType } from '../../../base/browser/ui/inputbox/inputBox.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import Severity$1 from '../../../base/common/severity.js';
-import './media/quickInput.css.js';
+import './media/quickInput.css';
 
 const $ = $$1;
 class QuickInputBox extends Disposable {

package/vscode/src/vs/platform/quickinput/browser/quickInputController.d.ts

@@ -12,7 +12,6 @@ export declare class QuickInputController extends Disposable {
     private options;
     private readonly layoutService;
     private readonly instantiationService;
-    private readonly contextKeyService;
     private readonly storageService;
     private static readonly MAX_WIDTH;
     private idPrefix;

package/vscode/src/vs/platform/quickinput/browser/quickInputController.js

@@ -15,7 +15,7 @@ import { isString } from '../../../base/common/types.js';
 import { localize } from '../../../nls.js';
 import { QuickInputHideReason, QuickPickFocus } from '../common/quickInput.js';
 import { QuickInputBox } from './quickInputBox.js';
-import { InQuickInputContextKey, QuickInputTypeContextKey, EndOfQuickInputBoxContextKey, backButton, QuickPick, InputBox, QuickWidget, QuickInputAlignmentContextKey } from './quickInput.js';
+import { backButton, InQuickInputContextKey, QuickInputTypeContextKey, EndOfQuickInputBoxContextKey, QuickPick, InputBox, QuickWidget, QuickInputAlignmentContextKey } from './quickInput.js';
 import { ILayoutService } from '../../layout/browser/layoutService.service.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
@@ -28,7 +28,7 @@ import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IStorageService } from '../../storage/common/storage.service.js';
 import { IConfigurationService } from '../../configuration/common/configuration.service.js';
 import { platform, Platform } from '../../../base/common/platform.js';
-import { getTitleBarStyle, TitlebarStyle } from '../../window/common/window.js';
+import { getWindowControlsStyle, WindowControlsStyle } from '../../window/common/window.js';
 import { getZoomFactor } from '../../../base/browser/browser.js';
 import { autorun } from '../../../base/common/observableInternal/autorun.js';
 import { observableValue } from '../../../base/common/observableInternal/base.js';
@@ -46,7 +46,6 @@ let QuickInputController = class QuickInputController extends Disposable {
         this.options = options;
         this.layoutService = layoutService;
         this.instantiationService = instantiationService;
-        this.contextKeyService = contextKeyService;
         this.storageService = storageService;
         this.enabled = true;
         this.onDidAcceptEmitter = this._register(( new Emitter()));
@@ -58,10 +57,10 @@ let QuickInputController = class QuickInputController extends Disposable {
         this.onShow = this.onShowEmitter.event;
         this.onHideEmitter = this._register(( new Emitter()));
         this.onHide = this.onHideEmitter.event;
-        this.inQuickInputContext = InQuickInputContextKey.bindTo(this.contextKeyService);
-        this.quickInputTypeContext = QuickInputTypeContextKey.bindTo(this.contextKeyService);
-        this.endOfQuickInputBoxContext = EndOfQuickInputBoxContextKey.bindTo(this.contextKeyService);
         this.backButton = backButton;
+        this.inQuickInputContext = InQuickInputContextKey.bindTo(contextKeyService);
+        this.quickInputTypeContext = QuickInputTypeContextKey.bindTo(contextKeyService);
+        this.endOfQuickInputBoxContext = EndOfQuickInputBoxContextKey.bindTo(contextKeyService);
         this.idPrefix = options.idPrefix;
         this._container = options.container;
         this.styles = options.styles;
@@ -106,7 +105,7 @@ let QuickInputController = class QuickInputController extends Disposable {
         const headerContainer = append(container, $('.quick-input-header'));
         const checkAll = append(headerContainer, $('input.quick-input-check-all'));
         checkAll.type = 'checkbox';
-        checkAll.setAttribute('aria-label', ( localize(1904, "Toggle all checkboxes")));
+        checkAll.setAttribute('aria-label', ( localize(1941, "Toggle all checkboxes")));
         this._register(addStandardDisposableListener(checkAll, EventType.CHANGE, e => {
             const checked = checkAll.checked;
             list.setAllVisibleChecked(checked);
@@ -124,21 +123,21 @@ let QuickInputController = class QuickInputController extends Disposable {
         const visibleCountContainer = append(filterContainer, $('.quick-input-visible-count'));
         visibleCountContainer.setAttribute('aria-live', 'polite');
         visibleCountContainer.setAttribute('aria-atomic', 'true');
-        const visibleCount = this._register(( new CountBadge(visibleCountContainer, { countFormat: ( localize(1905, "{0} Results")) }, this.styles.countBadge)));
+        const visibleCount = this._register(( new CountBadge(visibleCountContainer, { countFormat: ( localize(1942, "{0} Results")) }, this.styles.countBadge)));
         const countContainer = append(filterContainer, $('.quick-input-count'));
         countContainer.setAttribute('aria-live', 'polite');
-        const count = this._register(( new CountBadge(countContainer, { countFormat: ( localize(1906, "{0} Selected")) }, this.styles.countBadge)));
+        const count = this._register(( new CountBadge(countContainer, { countFormat: ( localize(1943, "{0} Selected")) }, this.styles.countBadge)));
         const inlineActionBar = this._register(( new ActionBar(headerContainer, { hoverDelegate: this.options.hoverDelegate })));
         inlineActionBar.domNode.classList.add('quick-input-inline-action-bar');
         const okContainer = append(headerContainer, $('.quick-input-action'));
         const ok = this._register(( new Button(okContainer, this.styles.button)));
-        ok.label = ( localize(1907, "OK"));
+        ok.label = ( localize(1944, "OK"));
         this._register(ok.onDidClick(e => {
             this.onDidAcceptEmitter.fire();
         }));
         const customButtonContainer = append(headerContainer, $('.quick-input-action'));
         const customButton = this._register(( new Button(customButtonContainer, { ...this.styles.button, supportIcons: true })));
-        customButton.label = ( localize(1908, "Custom"));
+        customButton.label = ( localize(1945, "Custom"));
         this._register(customButton.onDidClick(e => {
             this.onDidCustomEmitter.fire();
         }));
@@ -564,7 +563,7 @@ let QuickInputController = class QuickInputController extends Disposable {
         ui.ignoreFocusOut = false;
         ui.inputBox.toggles = undefined;
         const backKeybindingLabel = this.options.backKeybindingLabel();
-        backButton.tooltip = backKeybindingLabel ? ( localize(1909, "Back ({0})", backKeybindingLabel)) : ( localize(1910, "Back"));
+        backButton.tooltip = backKeybindingLabel ? ( localize(1946, "Back ({0})", backKeybindingLabel)) : ( localize(1947, "Back"));
         ui.container.style.display = '';
         this.updateLayout();
         this.dndController?.layoutContainer();
@@ -774,21 +773,20 @@ QuickInputController = QuickInputController_1 = ( __decorate([
     ( __param(4, IStorageService))
 ], QuickInputController));
 let QuickInputDragAndDropController = class QuickInputDragAndDropController extends Disposable {
-    constructor(_container, _quickInputContainer, _quickInputDragAreas, initialViewState, _layoutService, _contextKeyService, configurationService) {
+    constructor(_container, _quickInputContainer, _quickInputDragAreas, initialViewState, _layoutService, contextKeyService, configurationService) {
         super();
         this._container = _container;
         this._quickInputContainer = _quickInputContainer;
         this._quickInputDragAreas = _quickInputDragAreas;
         this._layoutService = _layoutService;
-        this._contextKeyService = _contextKeyService;
         this.configurationService = configurationService;
         this.dndViewState = observableValue(this, undefined);
         this._snapThreshold = 20;
         this._snapLineHorizontalRatio = 0.25;
-        this._quickInputAlignmentContext = QuickInputAlignmentContextKey.bindTo(this._contextKeyService);
-        const customTitleBar = getTitleBarStyle(this.configurationService) === TitlebarStyle.CUSTOM;
-        this._controlsOnLeft = customTitleBar && platform === Platform.Mac;
-        this._controlsOnRight = customTitleBar && (platform === Platform.Windows || platform === Platform.Linux);
+        this._quickInputAlignmentContext = QuickInputAlignmentContextKey.bindTo(contextKeyService);
+        const customWindowControls = getWindowControlsStyle(this.configurationService) === WindowControlsStyle.CUSTOM;
+        this._controlsOnLeft = customWindowControls && platform === Platform.Mac;
+        this._controlsOnRight = customWindowControls && (platform === Platform.Windows || platform === Platform.Linux);
         this._registerLayoutListener();
         this.registerMouseListeners();
         this.dndViewState.set({ ...initialViewState, done: true }, undefined);

package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js

@@ -186,7 +186,7 @@ class QuickInputItemDelegate {
 }
 class QuickInputAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(1911, "Quick Input");
+        return localize(1948, "Quick Input");
     }
     getAriaLabel(element) {
         return element.separator?.label
@@ -285,6 +285,8 @@ let QuickPickItemElementRenderer = class QuickPickItemElementRenderer extends Ba
         data.element = element;
         element.element = data.entry ?? undefined;
         const mainItem = element.item;
+        element.element.classList.toggle('indented', Boolean(mainItem.indented));
+        element.element.classList.toggle('not-pickable', element.item.pickable === false);
         data.checkbox.checked = element.checked;
         data.toDisposeElement.add(element.onChecked(checked => data.checkbox.checked = checked));
         data.checkbox.disabled = element.checkboxDisabled;
@@ -766,7 +768,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
     setAllVisibleChecked(checked) {
         this._elementCheckedEventBufferer.bufferEvents(() => {
             this._itemElements.forEach(element => {
-                if (!element.hidden && !element.checkboxDisabled) {
+                if (!element.hidden && !element.checkboxDisabled && element.item.pickable !== false) {
                     element.checked = checked;
                 }
             });
@@ -1181,7 +1183,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
     _allVisibleChecked(elements, whenNoneVisible = true) {
         for (let i = 0, n = elements.length; i < n; i++) {
             const element = elements[i];
-            if (!element.hidden) {
+            if (!element.hidden && element.item.pickable !== false) {
                 if (!element.checked) {
                     return false;
                 }

package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js

@@ -10,7 +10,7 @@ import { renderLabelWithIcons } from '../../../base/browser/ui/iconLabel/iconLab
 import { IdGenerator } from '../../../base/common/idGenerator.js';
 import { KeyCode } from '../../../base/common/keyCodes.js';
 import { parseLinkedText } from '../../../base/common/linkedText.js';
-import './media/quickInput.css.js';
+import './media/quickInput.css';
 import { localize } from '../../../nls.js';
 
 const iconPathToClass = {};
@@ -58,7 +58,7 @@ function renderQuickInputDescription(description, container, actionHandler) {
             let title = node.title;
             if (!title && node.href.startsWith('command:')) {
                 title = ( localize(
-                    1912,
+                    1949,
                     "Click to execute command '{0}'",
                     node.href.substring('command:'.length)
                 ));

package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts

@@ -34,6 +34,8 @@ export interface IQuickPickItem {
     picked?: boolean;
     disabled?: boolean;
     alwaysShow?: boolean;
+    indented?: boolean;
+    pickable?: boolean;
 }
 export interface IQuickPickSeparator {
     type: "separator";

package/vscode/src/vs/platform/remote/common/remoteSocketFactoryService.service.d.ts

@@ -1,5 +1,5 @@
 import { IDisposable } from "../../../base/common/lifecycle.js";
-import { ISocket } from "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common/vscode/vs/base/parts/ipc/common/ipc.net";
+import { ISocket } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc.net";
 import { RemoteConnectionType, RemoteConnection } from "./remoteAuthorityResolver.js";
 import { ISocketFactory } from "@codingame/monaco-vscode-remote-agent-service-override/vscode/vs/platform/remote/common/remoteSocketFactoryService";
 export declare const IRemoteSocketFactoryService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IRemoteSocketFactoryService>;

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

@@ -108,7 +108,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
         {
             id: 'http',
             order: 15,
-            title: ( localize(1916, "HTTP")),
+            title: ( localize(1953, "HTTP")),
             type: 'object',
             scope: ConfigurationScope.MACHINE,
             properties: {
@@ -116,7 +116,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: useHostProxyDefault,
                     markdownDescription: ( localize(
-                        1917,
+                        1954,
                         "Controls whether in the remote extension host the local proxy configuration should be used. This setting only applies as a remote setting during [remote development](https://aka.ms/vscode-remote)."
                     )),
                     restricted: true
@@ -126,7 +126,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
         {
             id: 'http',
             order: 15,
-            title: ( localize(1916, "HTTP")),
+            title: ( localize(1953, "HTTP")),
             type: 'object',
             scope: ConfigurationScope.APPLICATION,
             properties: {
@@ -134,7 +134,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: false,
                     description: ( localize(
-                        1918,
+                        1955,
                         "Controls whether use of Electron's fetch implementation instead of Node.js' should be enabled. All local extensions will get Electron's fetch implementation for the global fetch API."
                     )),
                     restricted: true
@@ -144,7 +144,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
         {
             id: 'http',
             order: 15,
-            title: ( localize(1916, "HTTP")),
+            title: ( localize(1953, "HTTP")),
             type: 'object',
             scope: useHostProxy ? ConfigurationScope.APPLICATION : ConfigurationScope.MACHINE,
             properties: {
@@ -152,7 +152,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'string',
                     pattern: '^(https?|socks|socks4a?|socks5h?)://([^:]*(:[^@]*)?@)?([^:]+|\\[[:0-9a-fA-F]+\\])(:\\d+)?/?$|^$',
                     markdownDescription: ( localize(
-                        1919,
+                        1956,
                         "The proxy setting to use. If not set, will be inherited from the `http_proxy` and `https_proxy` environment variables. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -162,7 +162,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: true,
                     markdownDescription: ( localize(
-                        1920,
+                        1957,
                         "Controls whether the proxy server certificate should be verified against the list of supplied CAs. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -171,7 +171,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 'http.proxyKerberosServicePrincipal': {
                     type: 'string',
                     markdownDescription: ( localize(
-                        1921,
+                        1958,
                         "Overrides the principal service name for Kerberos authentication with the HTTP proxy. A default based on the proxy hostname is used when this is not set. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -181,7 +181,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'array',
                     items: { type: 'string' },
                     markdownDescription: ( localize(
-                        1922,
+                        1959,
                         "Specifies domain names for which proxy settings should be ignored for HTTP/HTTPS requests. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -191,7 +191,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: ['null', 'string'],
                     default: null,
                     markdownDescription: ( localize(
-                        1923,
+                        1960,
                         "The value to send as the `Proxy-Authorization` header for every network request. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -201,17 +201,17 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'string',
                     enum: ['off', 'on', 'fallback', 'override'],
                     enumDescriptions: [
-                        ( localize(1924, "Disable proxy support for extensions.")),
-                        ( localize(1925, "Enable proxy support for extensions.")),
+                        ( localize(1961, "Disable proxy support for extensions.")),
+                        ( localize(1962, "Enable proxy support for extensions.")),
                         ( localize(
-                        1926,
+                        1963,
                         "Enable proxy support for extensions, fall back to request options, when no proxy found."
                     )),
-                        ( localize(1927, "Enable proxy support for extensions, override request options.")),
+                        ( localize(1964, "Enable proxy support for extensions, override request options.")),
                     ],
                     default: 'override',
                     markdownDescription: ( localize(
-                        1928,
+                        1965,
                         "Use the proxy support for extensions. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -221,7 +221,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: true,
                     markdownDescription: ( localize(
-                        1929,
+                        1966,
                         "Controls whether CA certificates should be loaded from the OS. On Windows and macOS, a reload of the window is required after turning this off. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -232,7 +232,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     tags: ['experimental'],
                     default: false,
                     markdownDescription: ( localize(
-                        1930,
+                        1967,
                         "Controls whether experimental loading of CA certificates from the OS should be enabled. This uses a more general approach than the default implementation. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -242,7 +242,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: true,
                     markdownDescription: ( localize(
-                        1931,
+                        1968,
                         "Controls whether Node.js' fetch implementation should be extended with additional support. Currently proxy support ({1}) and system certificates ({2}) are added when the corresponding settings are enabled. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`',
                         '`#http.proxySupport#`',

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

@@ -54,7 +54,6 @@ export interface IStorageServiceOptions {
 }
 export declare function loadKeyTargets(storage: IStorage): IKeyTargets;
 export declare abstract class AbstractStorageService extends Disposable implements IStorageService {
-    private readonly options;
     readonly _serviceBrand: undefined;
     private static DEFAULT_FLUSH_INTERVAL;
     private readonly _onDidChangeValue;

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

@@ -40,17 +40,16 @@ class AbstractStorageService extends Disposable {
     static { this.DEFAULT_FLUSH_INTERVAL = 60 * 1000; }
     constructor(options = { flushInterval: AbstractStorageService.DEFAULT_FLUSH_INTERVAL }) {
         super();
-        this.options = options;
         this._onDidChangeValue = this._register(( new PauseableEmitter()));
         this._onDidChangeTarget = this._register(( new PauseableEmitter()));
         this.onDidChangeTarget = this._onDidChangeTarget.event;
         this._onWillSaveState = this._register(( new Emitter()));
         this.onWillSaveState = this._onWillSaveState.event;
-        this.flushWhenIdleScheduler = this._register(( new RunOnceScheduler(() => this.doFlushWhenIdle(), this.options.flushInterval)));
         this.runFlushWhenIdle = this._register(( new MutableDisposable()));
         this._workspaceKeyTargets = undefined;
         this._profileKeyTargets = undefined;
         this._applicationKeyTargets = undefined;
+        this.flushWhenIdleScheduler = this._register(( new RunOnceScheduler(() => this.doFlushWhenIdle(), options.flushInterval)));
     }
     onDidChangeValue(scope, key, disposable) {
         return Event.filter(this._onDidChangeValue.event, e => e.scope === scope && (key === undefined || e.key === key), disposable);

package/vscode/src/vs/platform/telemetry/common/telemetryUtils.js

@@ -36,7 +36,7 @@ class NullEndpointTelemetryService {
     }
 }
 const telemetryLogId = 'telemetry';
-const TelemetryLogGroup = { id: telemetryLogId, name: ( localize(1950, "Telemetry")) };
+const TelemetryLogGroup = { id: telemetryLogId, name: ( localize(1989, "Telemetry")) };
 function supportsTelemetry(productService, environmentService) {
     if (!environmentService.isBuilt && !environmentService.disableTelemetry) {
         return true;
@@ -192,7 +192,7 @@ function removePropertiesWithPossibleUserInfo(property) {
         { label: 'Generic Secret', regex: /(key|token|sig|secret|signature|password|passwd|pwd|android:value)[^a-zA-Z0-9]/i },
         { label: 'CLI Credentials', regex: /((login|psexec|(certutil|psexec)\.exe).{1,50}(\s-u(ser(name)?)?\s+.{3,100})?\s-(admin|user|vm|root)?p(ass(word)?)?\s+["']?[^$\-\/\s]|(^|[\s\r\n\\])net(\.exe)?.{1,5}(user\s+|share\s+\/user:| user -? secrets ? set) \s + [^ $\s \/])/ },
         { label: 'Microsoft Entra ID', regex: /eyJ(?:0eXAiOiJKV1Qi|hbGci|[a-zA-Z0-9\-_]+\.[a-zA-Z0-9\-_]+\.)/ },
-        { label: 'Email', regex: /@[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+/ }
+        { label: 'Email', regex: /[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/ }
     ];
     for (const secretRegex of userDataRegexes) {
         if (secretRegex.regex.test(property)) {

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

@@ -517,8 +517,10 @@ export interface IExtensionTerminalProfile extends ITerminalProfileContribution
 export type ITerminalProfileObject = ITerminalExecutable | ITerminalProfileSource | IExtensionTerminalProfile | null;
 export interface IShellIntegration {
     readonly capabilities: ITerminalCapabilityStore;
+    readonly seenSequences: ReadonlySet<string>;
     readonly status: ShellIntegrationStatus;
     readonly onDidChangeStatus: Event<ShellIntegrationStatus>;
+    readonly onDidChangeSeenSequences: Event<ReadonlySet<string>>;
     deserialize(serialized: ISerializedCommandDetectionCapability): void;
 }
 export interface IDecorationAddon {

package/vscode/src/vs/platform/theme/browser/defaultStyles.d.ts

@@ -3,7 +3,7 @@ import { IKeybindingLabelStyles } from "../../../base/browser/ui/keybindingLabel
 import { ColorIdentifier } from "../common/colorRegistry.js";
 import { IProgressBarStyles } from "../../../base/browser/ui/progressbar/progressbar.js";
 import { ICheckboxStyles, IToggleStyles } from "../../../base/browser/ui/toggle/toggle.js";
-import { IDialogStyles } from "@codingame/monaco-vscode-44b92f80-48ea-5562-a8d0-18a015f8d845-common/vscode/vs/base/browser/ui/dialog/dialog";
+import { IDialogStyles } from "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/base/browser/ui/dialog/dialog";
 import { IInputBoxStyles } from "../../../base/browser/ui/inputbox/inputBox.js";
 import { IFindWidgetStyles } from "../../../base/browser/ui/tree/abstractTree.js";
 import { ICountBadgeStyles } from "../../../base/browser/ui/countBadge/countBadge.js";

package/vscode/src/vs/platform/theme/common/colorUtils.js

@@ -45,7 +45,7 @@ class ColorRegistry {
         for (const key of ( Object.keys(this.colorsById))) {
             const color = colorThemeData.getColor(key);
             if (color) {
-                this.colorSchema.properties[key].oneOf[0].defaultSnippets[0].body = `\${1:${( color.toString())}}`;
+                this.colorSchema.properties[key].oneOf[0].defaultSnippets[0].body = `\${1:${Color.Format.CSS.formatHexA(color, true)}}`;
             }
         }
         this._onDidChangeSchema.fire();
@@ -59,13 +59,13 @@ class ColorRegistry {
         }
         if (needsTransparency) {
             propertySchema.pattern = '^#(?:(?<rgba>[0-9a-fA-f]{3}[0-9a-eA-E])|(?:[0-9a-fA-F]{6}(?:(?![fF]{2})(?:[0-9a-fA-F]{2}))))?$';
-            propertySchema.patternErrorMessage = ( localize(1983, 'This color must be transparent or it will obscure content'));
+            propertySchema.patternErrorMessage = ( localize(2022, 'This color must be transparent or it will obscure content'));
         }
         this.colorSchema.properties[id] = {
             description,
             oneOf: [
                 propertySchema,
-                { type: 'string', const: DEFAULT_COLOR_CONFIG_VALUE, description: ( localize(1984, 'Use the default color.')) }
+                { type: 'string', const: DEFAULT_COLOR_CONFIG_VALUE, description: ( localize(2023, 'Use the default color.')) }
             ]
         };
         this.colorReferenceSchema.enum.push(id);

package/vscode/src/vs/platform/theme/common/colors/baseColors.js

@@ -4,48 +4,48 @@ import { Color } from '../../../../base/common/color.js';
 import { registerColor, transparent } from '../colorUtils.js';
 
 const foreground = registerColor('foreground', { dark: '#CCCCCC', light: '#616161', hcDark: '#FFFFFF', hcLight: '#292929' }, ( localize(
- 1985,
+ 2024,
  "Overall foreground color. This color is only used if not overridden by a component."
 )));
 const disabledForeground = registerColor('disabledForeground', { dark: '#CCCCCC80', light: '#61616180', hcDark: '#A5A5A5', hcLight: '#7F7F7F' }, ( localize(
- 1986,
+ 2025,
  "Overall foreground for disabled elements. This color is only used if not overridden by a component."
 )));
 const errorForeground = registerColor('errorForeground', { dark: '#F48771', light: '#A1260D', hcDark: '#F48771', hcLight: '#B5200D' }, ( localize(
- 1987,
+ 2026,
  "Overall foreground color for error messages. This color is only used if not overridden by a component."
 )));
 const descriptionForeground = registerColor('descriptionForeground', { light: '#717171', dark: ( transparent(foreground, 0.7)), hcDark: ( transparent(foreground, 0.7)), hcLight: ( transparent(foreground, 0.7)) }, ( localize(
- 1988,
+ 2027,
  "Foreground color for description text providing additional information, for example for a label."
 )));
-const iconForeground = registerColor('icon.foreground', { dark: '#C5C5C5', light: '#424242', hcDark: '#FFFFFF', hcLight: '#292929' }, ( localize(1989, "The default color for icons in the workbench.")));
+const iconForeground = registerColor('icon.foreground', { dark: '#C5C5C5', light: '#424242', hcDark: '#FFFFFF', hcLight: '#292929' }, ( localize(2028, "The default color for icons in the workbench.")));
 const focusBorder = registerColor('focusBorder', { dark: '#007FD4', light: '#0090F1', hcDark: '#F38518', hcLight: '#006BBD' }, ( localize(
- 1990,
+ 2029,
  "Overall border color for focused elements. This color is only used if not overridden by a component."
 )));
 const contrastBorder = registerColor('contrastBorder', { light: null, dark: null, hcDark: '#6FC3DF', hcLight: '#0F4A85' }, ( localize(
- 1991,
+ 2030,
  "An extra border around elements to separate them from others for greater contrast."
 )));
 const activeContrastBorder = registerColor('contrastActiveBorder', { light: null, dark: null, hcDark: focusBorder, hcLight: focusBorder }, ( localize(
- 1992,
+ 2031,
  "An extra border around active elements to separate them from others for greater contrast."
 )));
 const selectionBackground = registerColor('selection.background', null, ( localize(
- 1993,
+ 2032,
  "The background color of text selections in the workbench (e.g. for input fields or text areas). Note that this does not apply to selections within the editor."
 )));
-const textLinkForeground = registerColor('textLink.foreground', { light: '#006AB1', dark: '#3794FF', hcDark: '#21A6FF', hcLight: '#0F4A85' }, ( localize(1994, "Foreground color for links in text.")));
+const textLinkForeground = registerColor('textLink.foreground', { light: '#006AB1', dark: '#3794FF', hcDark: '#21A6FF', hcLight: '#0F4A85' }, ( localize(2033, "Foreground color for links in text.")));
 const textLinkActiveForeground = registerColor('textLink.activeForeground', { light: '#006AB1', dark: '#3794FF', hcDark: '#21A6FF', hcLight: '#0F4A85' }, ( localize(
- 1995,
+ 2034,
  "Foreground color for links in text when clicked on and on mouse hover."
 )));
-registerColor('textSeparator.foreground', { light: '#0000002e', dark: '#ffffff2e', hcDark: Color.black, hcLight: '#292929' }, ( localize(1996, "Color for text separators.")));
-registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' }, ( localize(1997, "Foreground color for preformatted text segments.")));
-registerColor('textPreformat.background', { light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' }, ( localize(1998, "Background color for preformatted text segments.")));
-const textBlockQuoteBackground = registerColor('textBlockQuote.background', { light: '#f2f2f2', dark: '#222222', hcDark: null, hcLight: '#F2F2F2' }, ( localize(1999, "Background color for block quotes in text.")));
-const textBlockQuoteBorder = registerColor('textBlockQuote.border', { light: '#007acc80', dark: '#007acc80', hcDark: Color.white, hcLight: '#292929' }, ( localize(2000, "Border color for block quotes in text.")));
-registerColor('textCodeBlock.background', { light: '#dcdcdc66', dark: '#0a0a0a66', hcDark: Color.black, hcLight: '#F2F2F2' }, ( localize(2001, "Background color for code blocks in text.")));
+registerColor('textSeparator.foreground', { light: '#0000002e', dark: '#ffffff2e', hcDark: Color.black, hcLight: '#292929' }, ( localize(2035, "Color for text separators.")));
+registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' }, ( localize(2036, "Foreground color for preformatted text segments.")));
+registerColor('textPreformat.background', { light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' }, ( localize(2037, "Background color for preformatted text segments.")));
+const textBlockQuoteBackground = registerColor('textBlockQuote.background', { light: '#f2f2f2', dark: '#222222', hcDark: null, hcLight: '#F2F2F2' }, ( localize(2038, "Background color for block quotes in text.")));
+const textBlockQuoteBorder = registerColor('textBlockQuote.border', { light: '#007acc80', dark: '#007acc80', hcDark: Color.white, hcLight: '#292929' }, ( localize(2039, "Border color for block quotes in text.")));
+registerColor('textCodeBlock.background', { light: '#dcdcdc66', dark: '#0a0a0a66', hcDark: Color.black, hcLight: '#F2F2F2' }, ( localize(2040, "Background color for code blocks in text.")));
 
 export { activeContrastBorder, contrastBorder, descriptionForeground, disabledForeground, errorForeground, focusBorder, foreground, iconForeground, selectionBackground, textBlockQuoteBackground, textBlockQuoteBorder, textLinkActiveForeground, textLinkForeground };