@codingame/monaco-vscode-api 16.1.0 → 17.0.0

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

@@ -1,36 +1,38 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { $ as $$1, append, addStandardDisposableListener, EventType, prepend, addDisposableListener, isHTMLAnchorElement, isAncestor } from '../../../base/browser/dom.js';
 import { asCSSUrl } from '../../../base/browser/cssValue.js';
-import { Event, Emitter, EventBufferer } from '../../../base/common/event.js';
-import { TreeVisibility } from '../../../base/browser/ui/tree/tree.js';
-import { localize } from '../../../nls.js';
-import { IInstantiationService } from '../../instantiation/common/instantiation.js';
-import { WorkbenchObjectTree } from '../../list/browser/listService.js';
-import { IThemeService } from '../../theme/common/themeService.service.js';
-import { DisposableStore, Disposable } from '../../../base/common/lifecycle.js';
-import { QuickPickFocus } from '../common/quickInput.js';
+import { $ as $$1, append, addStandardDisposableListener, EventType, prepend, addDisposableListener, isHTMLAnchorElement, isAncestor } from '../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
-import { KeyCode } from '../../../base/common/keyCodes.js';
-import { OS } from '../../../base/common/platform.js';
-import { memoize } from '../../../base/common/decorators.js';
-import { IconLabel } from '../../../base/browser/ui/iconLabel/iconLabel.js';
-import { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
-import { isDark } from '../../theme/common/theme.js';
-import { URI } from '../../../base/common/uri.js';
-import { quickInputButtonToAction } from './quickInputUtils.js';
-import { Lazy } from '../../../base/common/lazy.js';
-import { parseLabelWithIcons, getCodiconAriaLabel, matchesFuzzyIconAware } from '../../../base/common/iconLabels.js';
 import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
-import { compareAnything } from '../../../base/common/comparers.js';
-import { escape, ltrim } from '../../../base/common/strings.js';
+import { IconLabel } from '../../../base/browser/ui/iconLabel/iconLabel.js';
+import { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { Checkbox } from '../../../base/browser/ui/toggle/toggle.js';
 import { RenderIndentGuides } from '../../../base/browser/ui/tree/abstractTree.js';
+import { TreeVisibility } from '../../../base/browser/ui/tree/tree.js';
+import { equals } from '../../../base/common/arrays.js';
 import { ThrottledDelayer } from '../../../base/common/async.js';
+import { compareAnything } from '../../../base/common/comparers.js';
+import { memoize } from '../../../base/common/decorators.js';
 import { isCancellationError } from '../../../base/common/errors.js';
-import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
+import { Event, Emitter, EventBufferer } from '../../../base/common/event.js';
+import { parseLabelWithIcons, getCodiconAriaLabel, matchesFuzzyIconAware } from '../../../base/common/iconLabels.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { Lazy } from '../../../base/common/lazy.js';
+import { DisposableStore, MutableDisposable, Disposable } from '../../../base/common/lifecycle.js';
 import '../../../base/common/observableInternal/index.js';
-import { equals } from '../../../base/common/arrays.js';
+import { OS } from '../../../base/common/platform.js';
+import { escape, ltrim } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
+import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { WorkbenchObjectTree } from '../../list/browser/listService.js';
+import { defaultCheckboxStyles } from '../../theme/browser/defaultStyles.js';
+import { isDark } from '../../theme/common/theme.js';
+import { IThemeService } from '../../theme/common/themeService.service.js';
+import { QuickPickFocus } from '../common/quickInput.js';
+import { quickInputButtonToAction } from './quickInputUtils.js';
 import { observableValueOpts } from '../../../base/common/observableInternal/api.js';
 import { observableValue, transaction } from '../../../base/common/observableInternal/base.js';
 
@@ -186,7 +188,7 @@ class QuickInputItemDelegate {
 }
 class QuickInputAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(1948, "Quick Input");
+        return localize(1964, "Quick Input");
     }
     getAriaLabel(element) {
         return element.separator?.label
@@ -219,13 +221,15 @@ class BaseQuickInputListRenderer {
         data.toDisposeTemplate = ( new DisposableStore());
         data.entry = append(container, $('.quick-input-list-entry'));
         const label = append(data.entry, $('label.quick-input-list-label'));
+        data.outerLabel = label;
+        data.checkbox = data.toDisposeTemplate.add(( new MutableDisposable()));
         data.toDisposeTemplate.add(addStandardDisposableListener(label, EventType.CLICK, e => {
-            if (!data.checkbox.offsetParent) {
-                e.preventDefault();
+            if (data.checkbox.value && !e.defaultPrevented && data.checkbox.value.enabled) {
+                const checked = !data.checkbox.value.checked;
+                data.checkbox.value.checked = checked;
+                data.element.checked = checked;
             }
         }));
-        data.checkbox = append(label, $('input.quick-input-list-checkbox'));
-        data.checkbox.type = 'checkbox';
         const rows = append(label, $('.quick-input-list-rows'));
         const row1 = append(rows, $('.quick-input-list-row'));
         const row2 = append(rows, $('.quick-input-list-row'));
@@ -273,12 +277,30 @@ let QuickPickItemElementRenderer = class QuickPickItemElementRenderer extends Ba
     get templateId() {
         return QuickPickItemElementRenderer_1.ID;
     }
-    renderTemplate(container) {
-        const data = super.renderTemplate(container);
-        data.toDisposeTemplate.add(addStandardDisposableListener(data.checkbox, EventType.CHANGE, e => {
-            data.element.checked = data.checkbox.checked;
-        }));
-        return data;
+    ensureCheckbox(element, data) {
+        if (!element.hasCheckbox) {
+            data.checkbox.value?.domNode.remove();
+            data.checkbox.clear();
+            return;
+        }
+        let checkbox = data.checkbox.value;
+        if (!checkbox) {
+            checkbox = ( new Checkbox(element.saneLabel, element.checked, { ...defaultCheckboxStyles, size: 15 }));
+            data.checkbox.value = checkbox;
+            data.outerLabel.prepend(checkbox.domNode);
+        }
+        else {
+            checkbox.setTitle(element.saneLabel);
+        }
+        if (element.checkboxDisabled) {
+            checkbox.disable();
+        }
+        else {
+            checkbox.enable();
+        }
+        checkbox.checked = element.checked;
+        data.toDisposeElement.add(element.onChecked(checked => checkbox.checked = checked));
+        data.toDisposeElement.add(checkbox.onChange(() => element.checked = checkbox.checked));
     }
     renderElement(node, index, data) {
         const element = node.element;
@@ -287,9 +309,7 @@ let QuickPickItemElementRenderer = class QuickPickItemElementRenderer extends Ba
         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;
+        this.ensureCheckbox(element, data);
         const { labelHighlights, descriptionHighlights, detailHighlights } = element;
         if (mainItem.iconPath) {
             const icon = isDark(this.themeService.getColorTheme().type) ? mainItem.iconPath.dark : (mainItem.iconPath.light ?? mainItem.iconPath.dark);
@@ -402,11 +422,6 @@ class QuickPickSeparatorElementRenderer extends BaseQuickInputListRenderer {
     isSeparatorVisible(separator) {
         return ( this._visibleSeparatorsFrequency.has(separator));
     }
-    renderTemplate(container) {
-        const data = super.renderTemplate(container);
-        data.checkbox.style.display = 'none';
-        return data;
-    }
     renderElement(node, index, data) {
         const element = node.element;
         data.element = element;
@@ -799,7 +814,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                 }
                 const qpi = ( new QuickPickItemElement(
                     index,
-                    this._hasCheckboxes,
+                    this._hasCheckboxes && item.pickable !== false,
                     e => this._onButtonTriggered.fire(e),
                     this._elementChecked,
                     item,

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

@@ -60,7 +60,7 @@ function renderQuickInputDescription(description, container, actionHandler) {
             let title = node.title;
             if (!title && node.href.startsWith('command:')) {
                 title = ( localize(
-                    1949,
+                    1965,
                     "Click to execute command '{0}'",
                     node.href.substring('command:'.length)
                 ));

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

@@ -1,6 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import { IMatch } from "../../../base/common/filters.js";
-import { IItemAccessor } from "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/base/common/fuzzyScorer";
+import { IItemAccessor } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/base/common/fuzzyScorer";
 import { ResolvedKeybinding } from "../../../base/common/keybindings.js";
 import { IDisposable } from "../../../base/common/lifecycle.js";
 import Severity from "../../../base/common/severity.js";

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

@@ -1,6 +1,6 @@
 
 import { ok } from '../../../base/common/assert.js';
-import { isString, isObject } from '../../../base/common/types.js';
+import { isString, isObject, isFunction } from '../../../base/common/types.js';
 
 class RegistryImpl {
     constructor() {
@@ -18,6 +18,14 @@ class RegistryImpl {
     as(id) {
         return this.data.get(id) || null;
     }
+    dispose() {
+        this.data.forEach((value) => {
+            if (isFunction(value.dispose)) {
+                value.dispose();
+            }
+        });
+        this.data.clear();
+    }
 }
 const Registry = ( new RegistryImpl());
 

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

@@ -1,6 +1,6 @@
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { Disposable } from "../../../base/common/lifecycle.js";
-import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common/vscode/vs/base/parts/request/common/request";
+import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-912ff6c1-e6aa-58cf-bd7f-50cf27bdb591-common/vscode/vs/base/parts/request/common/request";
 import { ILogService } from "../../log/common/log.service.js";
 import { IRequestService } from "./request.service.js";
 export interface AuthInfo {

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

@@ -108,7 +108,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
         {
             id: 'http',
             order: 15,
-            title: ( localize(1953, "HTTP")),
+            title: ( localize(1969, "HTTP")),
             type: 'object',
             scope: ConfigurationScope.MACHINE,
             properties: {
@@ -116,7 +116,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: useHostProxyDefault,
                     markdownDescription: ( localize(
-                        1954,
+                        1970,
                         "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(1953, "HTTP")),
+            title: ( localize(1969, "HTTP")),
             type: 'object',
             scope: ConfigurationScope.APPLICATION,
             properties: {
@@ -134,7 +134,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: false,
                     description: ( localize(
-                        1955,
+                        1971,
                         "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(1953, "HTTP")),
+            title: ( localize(1969, "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(
-                        1956,
+                        1972,
                         "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(
-                        1957,
+                        1973,
                         "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(
-                        1958,
+                        1974,
                         "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(
-                        1959,
+                        1975,
                         "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(
-                        1960,
+                        1976,
                         "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(1961, "Disable proxy support for extensions.")),
-                        ( localize(1962, "Enable proxy support for extensions.")),
+                        ( localize(1977, "Disable proxy support for extensions.")),
+                        ( localize(1978, "Enable proxy support for extensions.")),
                         ( localize(
-                        1963,
+                        1979,
                         "Enable proxy support for extensions, fall back to request options, when no proxy found."
                     )),
-                        ( localize(1964, "Enable proxy support for extensions, override request options.")),
+                        ( localize(1980, "Enable proxy support for extensions, override request options.")),
                     ],
                     default: 'override',
                     markdownDescription: ( localize(
-                        1965,
+                        1981,
                         "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(
-                        1966,
+                        1982,
                         "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(
-                        1967,
+                        1983,
                         "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(
-                        1968,
+                        1984,
                         "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/request/common/request.service.d.ts

@@ -1,5 +1,5 @@
 import { CancellationToken } from "../../../base/common/cancellation.js";
-import { IRequestOptions, IRequestContext } from "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common/vscode/vs/base/parts/request/common/request";
+import { IRequestOptions, IRequestContext } from "@codingame/monaco-vscode-912ff6c1-e6aa-58cf-bd7f-50cf27bdb591-common/vscode/vs/base/parts/request/common/request";
 import { AuthInfo, Credentials } from "./request.js";
 export declare const IRequestService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IRequestService>;
 export interface IRequestService {

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

@@ -36,7 +36,7 @@ class NullEndpointTelemetryService {
     }
 }
 const telemetryLogId = 'telemetry';
-const TelemetryLogGroup = { id: telemetryLogId, name: ( localize(1989, "Telemetry")) };
+const TelemetryLogGroup = { id: telemetryLogId, name: ( localize(2005, "Telemetry")) };
 function supportsTelemetry(productService, environmentService) {
     if (!environmentService.isBuilt && !environmentService.disableTelemetry) {
         return true;

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

@@ -202,7 +202,8 @@ export declare enum ProcessPropertyType {
     ResolvedShellLaunchConfig = "resolvedShellLaunchConfig",
     OverrideDimensions = "overrideDimensions",
     FailedShellIntegrationActivation = "failedShellIntegrationActivation",
-    UsedShellIntegrationInjection = "usedShellIntegrationInjection"
+    UsedShellIntegrationInjection = "usedShellIntegrationInjection",
+    ShellIntegrationInjectionFailureReason = "shellIntegrationInjectionFailureReason"
 }
 export interface IProcessProperty<T extends ProcessPropertyType> {
     type: T;
@@ -219,6 +220,7 @@ export interface IProcessPropertyMap {
     [ProcessPropertyType.OverrideDimensions]: ITerminalDimensionsOverride | undefined;
     [ProcessPropertyType.FailedShellIntegrationActivation]: boolean | undefined;
     [ProcessPropertyType.UsedShellIntegrationInjection]: boolean | undefined;
+    [ProcessPropertyType.ShellIntegrationInjectionFailureReason]: ShellIntegrationInjectionFailureReason | undefined;
 }
 export interface IFixedTerminalDimensions {
     cols?: number;
@@ -534,6 +536,17 @@ export declare enum ShellIntegrationStatus {
     FinalTerm = 1,
     VSCode = 2
 }
+export declare enum ShellIntegrationInjectionFailureReason {
+    InjectionSettingDisabled = "injectionSettingDisabled",
+    NoExecutable = "noExecutable",
+    FeatureTerminal = "featureTerminal",
+    IgnoreShellIntegrationFlag = "ignoreShellIntegrationFlag",
+    Winpty = "winpty",
+    UnsupportedArgs = "unsupportedArgs",
+    UnsupportedShell = "unsupportedShell",
+    FailedToSetStickyBit = "failedToSetStickyBit",
+    FailedToCreateTmpDir = "failedToCreateTmpDir"
+}
 export declare enum TerminalExitReason {
     Unknown = 0,
     Shutdown = 1,

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

@@ -158,6 +158,7 @@ var ProcessPropertyType;
     ProcessPropertyType["OverrideDimensions"] = "overrideDimensions";
     ProcessPropertyType["FailedShellIntegrationActivation"] = "failedShellIntegrationActivation";
     ProcessPropertyType["UsedShellIntegrationInjection"] = "usedShellIntegrationInjection";
+    ProcessPropertyType["ShellIntegrationInjectionFailureReason"] = "shellIntegrationInjectionFailureReason";
 })(ProcessPropertyType || (ProcessPropertyType = {}));
 var HeartbeatConstants;
 (function (HeartbeatConstants) {
@@ -199,6 +200,18 @@ var ShellIntegrationStatus;
     ShellIntegrationStatus[ShellIntegrationStatus["FinalTerm"] = 1] = "FinalTerm";
     ShellIntegrationStatus[ShellIntegrationStatus["VSCode"] = 2] = "VSCode";
 })(ShellIntegrationStatus || (ShellIntegrationStatus = {}));
+var ShellIntegrationInjectionFailureReason;
+(function (ShellIntegrationInjectionFailureReason) {
+    ShellIntegrationInjectionFailureReason["InjectionSettingDisabled"] = "injectionSettingDisabled";
+    ShellIntegrationInjectionFailureReason["NoExecutable"] = "noExecutable";
+    ShellIntegrationInjectionFailureReason["FeatureTerminal"] = "featureTerminal";
+    ShellIntegrationInjectionFailureReason["IgnoreShellIntegrationFlag"] = "ignoreShellIntegrationFlag";
+    ShellIntegrationInjectionFailureReason["Winpty"] = "winpty";
+    ShellIntegrationInjectionFailureReason["UnsupportedArgs"] = "unsupportedArgs";
+    ShellIntegrationInjectionFailureReason["UnsupportedShell"] = "unsupportedShell";
+    ShellIntegrationInjectionFailureReason["FailedToSetStickyBit"] = "failedToSetStickyBit";
+    ShellIntegrationInjectionFailureReason["FailedToCreateTmpDir"] = "failedToCreateTmpDir";
+})(ShellIntegrationInjectionFailureReason || (ShellIntegrationInjectionFailureReason = {}));
 var TerminalExitReason;
 (function (TerminalExitReason) {
     TerminalExitReason[TerminalExitReason["Unknown"] = 0] = "Unknown";
@@ -244,4 +257,4 @@ class TerminalBackendRegistry {
 }
 Registry.add(TerminalExtensions.Backend, ( new TerminalBackendRegistry()));
 
-export { FlowControlConstants, GeneralShellType, HeartbeatConstants, LocalReconnectConstants, PosixShellType, ProcessPropertyType, ProfileSource, ShellIntegrationStatus, TerminalBackendChangeEvent, TerminalExitReason, TerminalExtensions, TerminalIpcChannels, TerminalLocation, TerminalLocationString, TerminalSettingId, TerminalSettingPrefix, TitleEventSource, WindowsShellType };
+export { FlowControlConstants, GeneralShellType, HeartbeatConstants, LocalReconnectConstants, PosixShellType, ProcessPropertyType, ProfileSource, ShellIntegrationInjectionFailureReason, ShellIntegrationStatus, TerminalBackendChangeEvent, TerminalExitReason, TerminalExtensions, TerminalIpcChannels, TerminalLocation, TerminalLocationString, TerminalSettingId, TerminalSettingPrefix, TitleEventSource, WindowsShellType };

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

@@ -7,7 +7,7 @@ import { IDialogStyles } from "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-
 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";
-import { IBreadcrumbsWidgetStyles } from "@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common/vscode/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget";
+import { IBreadcrumbsWidgetStyles } from "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget";
 import { IListStyles } from "../../../base/browser/ui/list/listWidget.js";
 import { ISelectBoxStyles } from "../../../base/browser/ui/selectBox/selectBox.js";
 import { IMenuStyles } from "../../../base/browser/ui/menu/menu.js";
@@ -25,7 +25,6 @@ export declare const defaultToggleStyles: IToggleStyles;
 export declare const defaultRadioStyles: IRadioStyles;
 export declare function getToggleStyles(override: IStyleOverride<IToggleStyles>): IToggleStyles;
 export declare const defaultCheckboxStyles: ICheckboxStyles;
-export declare function getCheckboxStyles(override: IStyleOverride<ICheckboxStyles>): ICheckboxStyles;
 export declare const defaultDialogStyles: IDialogStyles;
 export declare function getDialogStyle(override: IStyleOverride<IDialogStyles>): IDialogStyles;
 export declare const defaultInputBoxStyles: IInputBoxStyles;

package/vscode/src/vs/platform/theme/browser/defaultStyles.js

@@ -3,7 +3,7 @@ import { asCssVariable, asCssVariableWithDefault } from '../common/colorUtils.js
 import { textLinkForeground, contrastBorder, activeContrastBorder, focusBorder } from '../common/colors/baseColors.js';
 import '../common/colors/chartsColors.js';
 import { widgetShadow, problemsInfoIconForeground, problemsWarningIconForeground, problemsErrorIconForeground, editorWidgetForeground, editorWidgetBackground, breadcrumbsActiveSelectionForeground, breadcrumbsFocusForeground, breadcrumbsForeground, breadcrumbsBackground, editorWidgetBorder } from '../common/colors/editorColors.js';
-import { keybindingLabelBottomBorder, keybindingLabelBorder, keybindingLabelForeground, keybindingLabelBackground, buttonBorder, buttonSecondaryHoverBackground, buttonSecondaryBackground, buttonSecondaryForeground, buttonHoverBackground, buttonBackground, buttonSeparator, buttonForeground, inputActiveOptionBackground, inputActiveOptionForeground, inputActiveOptionBorder, radioInactiveHoverBackground, radioInactiveBorder, radioInactiveBackground, radioInactiveForeground, radioActiveBorder, radioActiveBackground, radioActiveForeground, checkboxForeground, checkboxBorder, checkboxBackground, inputValidationErrorForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationWarningForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationInfoForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputBorder, inputForeground, inputBackground, selectBorder, selectForeground, selectListBackground, selectBackground } from '../common/colors/inputColors.js';
+import { keybindingLabelBottomBorder, keybindingLabelBorder, keybindingLabelForeground, keybindingLabelBackground, buttonBorder, buttonSecondaryHoverBackground, buttonSecondaryBackground, buttonSecondaryForeground, buttonHoverBackground, buttonBackground, buttonSeparator, buttonForeground, inputActiveOptionBackground, inputActiveOptionForeground, inputActiveOptionBorder, radioInactiveHoverBackground, radioInactiveBorder, radioInactiveBackground, radioInactiveForeground, radioActiveBorder, radioActiveBackground, radioActiveForeground, checkboxDisabledForeground, checkboxDisabledBackground, checkboxForeground, checkboxBorder, checkboxBackground, inputValidationErrorForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationWarningForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationInfoForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputBorder, inputForeground, inputBackground, selectBorder, selectForeground, selectListBackground, selectBackground } from '../common/colors/inputColors.js';
 import { listFilterWidgetShadow, listFilterWidgetNoMatchesOutline, listFilterWidgetOutline, listFilterWidgetBackground, tableOddRowsBackgroundColor, tableColumnsBorder, treeInactiveIndentGuidesStroke, treeIndentGuidesStroke, listDropBetweenBackground, listDropOverBackground, listHoverForeground, listHoverBackground, listInactiveFocusOutline, listInactiveFocusBackground, listInactiveSelectionForeground, listInactiveSelectionIconForeground, listInactiveSelectionBackground, listActiveSelectionForeground, listActiveSelectionBackground, listFocusAndSelectionOutline, listActiveSelectionIconForeground, listFocusOutline, listFocusForeground, listFocusBackground } from '../common/colors/listColors.js';
 import { menuSeparatorBackground, menuSelectionBorder, menuSelectionBackground, menuSelectionForeground, menuBackground, menuForeground, menuBorder } from '../common/colors/menuColors.js';
 import '../common/colors/minimapColors.js';
@@ -57,7 +57,9 @@ const defaultToggleStyles = {
 const defaultCheckboxStyles = {
     checkboxBackground: asCssVariable(checkboxBackground),
     checkboxBorder: asCssVariable(checkboxBorder),
-    checkboxForeground: asCssVariable(checkboxForeground)
+    checkboxForeground: asCssVariable(checkboxForeground),
+    checkboxDisabledBackground: asCssVariable(checkboxDisabledBackground),
+    checkboxDisabledForeground: asCssVariable(checkboxDisabledForeground),
 };
 const defaultDialogStyles = {
     dialogBackground: asCssVariable(editorWidgetBackground),

package/vscode/src/vs/platform/theme/common/colorUtils.d.ts

@@ -20,7 +20,8 @@ export declare enum ColorTransformType {
     Opaque = 3,
     OneOf = 4,
     LessProminent = 5,
-    IfDefinedThenElse = 6
+    IfDefinedThenElse = 6,
+    Mix = 7
 }
 export type ColorTransform = {
     op: ColorTransformType.Darken;
@@ -52,6 +53,11 @@ export type ColorTransform = {
     if: ColorIdentifier;
     then: ColorValue;
     else: ColorValue;
+} | {
+    op: ColorTransformType.Mix;
+    color: ColorValue;
+    with: ColorValue;
+    ratio?: number;
 };
 export interface ColorDefaults {
     light: ColorValue | null;

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

@@ -6,6 +6,7 @@ import { Emitter } from '../../../base/common/event.js';
 import { Extensions as Extensions$1 } from '../../jsonschemas/common/jsonContributionRegistry.js';
 import { Registry } from '../../registry/common/platform.js';
 import { localize } from '../../../nls.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 
 function asCssVariableName(colorIdent) {
     return `--vscode-${colorIdent.replace(/\./g, '-')}`;
@@ -25,6 +26,7 @@ var ColorTransformType;
     ColorTransformType[ColorTransformType["OneOf"] = 4] = "OneOf";
     ColorTransformType[ColorTransformType["LessProminent"] = 5] = "LessProminent";
     ColorTransformType[ColorTransformType["IfDefinedThenElse"] = 6] = "IfDefinedThenElse";
+    ColorTransformType[ColorTransformType["Mix"] = 7] = "Mix";
 })(ColorTransformType || (ColorTransformType = {}));
 function isColorDefaults(value) {
     return value !== null && typeof value === 'object' && 'light' in value && 'dark' in value;
@@ -33,9 +35,10 @@ const Extensions = {
     ColorContribution: 'base.contributions.colors'
 };
 const DEFAULT_COLOR_CONFIG_VALUE = 'default';
-class ColorRegistry {
+class ColorRegistry extends Disposable {
     constructor() {
-        this._onDidChangeSchema = ( new Emitter());
+        super();
+        this._onDidChangeSchema = this._register(( new Emitter()));
         this.onDidChangeSchema = this._onDidChangeSchema.event;
         this.colorSchema = { type: 'object', properties: {} };
         this.colorReferenceSchema = { type: 'string', enum: [], enumDescriptions: [] };
@@ -59,13 +62,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(2022, 'This color must be transparent or it will obscure content'));
+            propertySchema.patternErrorMessage = ( localize(2038, '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(2023, 'Use the default color.')) }
+                { type: 'string', const: DEFAULT_COLOR_CONFIG_VALUE, description: ( localize(2039, 'Use the default color.')) }
             ]
         };
         this.colorReferenceSchema.enum.push(id);
@@ -128,6 +131,11 @@ function executeTransform(transform, theme) {
             return resolveColorValue(transform.value, theme)?.lighten(transform.factor);
         case ColorTransformType.Transparent:
             return resolveColorValue(transform.value, theme)?.transparent(transform.factor);
+        case ColorTransformType.Mix: {
+            const primaryColor = resolveColorValue(transform.color, theme) || Color.transparent;
+            const otherColor = resolveColorValue(transform.with, theme) || Color.transparent;
+            return primaryColor.mix(otherColor, transform.ratio);
+        }
         case ColorTransformType.Opaque: {
             const backgroundColor = resolveColorValue(transform.background, theme);
             if (!backgroundColor) {