@codingame/monaco-vscode-api 19.1.4 → 20.0.0

package/vscode/src/vs/platform/quickinput/browser/tree/quickTree.js

@@ -0,0 +1,189 @@
+
+import { Event, Emitter } from '../../../../base/common/event.js';
+import '../../../../base/common/observableInternal/index.js';
+import { localize } from '../../../../nls.js';
+import { QuickInputType } from '../../common/quickInput.js';
+import { QuickInput } from '../quickInput.js';
+import { getParentNodeState } from './quickInputTree.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
+import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
+
+class QuickTree extends QuickInput {
+    static { this.DEFAULT_ARIA_LABEL = ( localize(2006, "Type to narrow down results.")); }
+    constructor(ui) {
+        super(ui);
+        this.type = QuickInputType.QuickTree;
+        this._value = observableValue('value', '');
+        this._ariaLabel = observableValue('ariaLabel', undefined);
+        this._placeholder = observableValue('placeholder', undefined);
+        this._matchOnDescription = observableValue('matchOnDescription', false);
+        this._matchOnDetail = observableValue('matchOnDetail', false);
+        this._matchOnLabel = observableValue('matchOnLabel', true);
+        this._activeItems = observableValue('activeItems', []);
+        this._itemTree = observableValue('itemTree', []);
+        this.onDidChangeValue = Event.fromObservable(this._value, this._store);
+        this.onDidChangeActive = Event.fromObservable(this._activeItems, this._store);
+        this._onDidChangeCheckedLeafItems = ( new Emitter());
+        this.onDidChangeCheckedLeafItems = this._onDidChangeCheckedLeafItems.event;
+        this.onDidAccept = ui.onDidAccept;
+        this._registerAutoruns();
+        this._register(ui.tree.onDidChangeCheckedLeafItems(e => this._onDidChangeCheckedLeafItems.fire(e)));
+    }
+    get value() { return this._value.get(); }
+    set value(value) { this._value.set(value, undefined); }
+    get ariaLabel() { return this._ariaLabel.get(); }
+    set ariaLabel(ariaLabel) { this._ariaLabel.set(ariaLabel, undefined); }
+    get placeholder() { return this._placeholder.get(); }
+    set placeholder(placeholder) { this._placeholder.set(placeholder, undefined); }
+    get matchOnDescription() { return this._matchOnDescription.get(); }
+    set matchOnDescription(matchOnDescription) { this._matchOnDescription.set(matchOnDescription, undefined); }
+    get matchOnDetail() { return this._matchOnDetail.get(); }
+    set matchOnDetail(matchOnDetail) { this._matchOnDetail.set(matchOnDetail, undefined); }
+    get matchOnLabel() { return this._matchOnLabel.get(); }
+    set matchOnLabel(matchOnLabel) { this._matchOnLabel.set(matchOnLabel, undefined); }
+    get activeItems() { return this._activeItems.get(); }
+    set activeItems(activeItems) { this._activeItems.set(activeItems, undefined); }
+    get itemTree() { return this._itemTree.get(); }
+    get onDidTriggerItemButton() {
+        return this.ui.tree.onDidTriggerButton;
+    }
+    get checkedLeafItems() { return this.ui.tree.getCheckedLeafItems(); }
+    setItemTree(itemTree) {
+        this._itemTree.set(itemTree, undefined);
+    }
+    getParent(element) {
+        return this.ui.tree.tree.getParentElement(element) ?? undefined;
+    }
+    setCheckboxState(element, checked) {
+        this.ui.tree.check(element, checked);
+    }
+    expand(element) {
+        this.ui.tree.tree.expand(element);
+    }
+    collapse(element) {
+        this.ui.tree.tree.collapse(element);
+    }
+    isCollapsed(element) {
+        return this.ui.tree.tree.isCollapsed(element);
+    }
+    focusOnInput() {
+        this.ui.inputBox.setFocus();
+    }
+    show() {
+        if (!this.visible) {
+            const visibilities = {
+                title: !!this.title || !!this.step || !!this.titleButtons.length,
+                description: !!this.description,
+                checkAll: true,
+                checkBox: true,
+                inputBox: true,
+                progressBar: true,
+                visibleCount: true,
+                count: true,
+                ok: true,
+                list: false,
+                tree: true,
+                message: !!this.validationMessage,
+                customButton: false
+            };
+            this.ui.setVisibilities(visibilities);
+            this.visibleDisposables.add(this.ui.inputBox.onDidChange(value => {
+                this._value.set(value, undefined);
+            }));
+            this.visibleDisposables.add(this.ui.tree.onDidChangeCheckboxState((e) => {
+                const checkAllState = getParentNodeState([...this.ui.tree.tree.getNode().children]);
+                if (this.ui.checkAll.checked !== checkAllState) {
+                    this.ui.checkAll.checked = checkAllState;
+                }
+            }));
+            this.visibleDisposables.add(this.ui.checkAll.onChange(_e => {
+                const checked = this.ui.checkAll.checked;
+                this.ui.tree.checkAll(checked);
+            }));
+            this.visibleDisposables.add(this.ui.tree.onDidChangeCheckedLeafItems(e => {
+                this.ui.count.setCount(e.length);
+            }));
+        }
+        super.show();
+        this.ui.count.setCount(this.ui.tree.getCheckedLeafItems().length);
+        const checkAllState = getParentNodeState([...this.ui.tree.tree.getNode().children]);
+        if (this.ui.checkAll.checked !== checkAllState) {
+            this.ui.checkAll.checked = checkAllState;
+        }
+    }
+    update() {
+        if (!this.visible) {
+            return;
+        }
+        const visibilities = {
+            title: !!this.title || !!this.step || !!this.titleButtons.length,
+            description: !!this.description,
+            checkAll: true,
+            checkBox: true,
+            inputBox: true,
+            progressBar: true,
+            visibleCount: true,
+            count: true,
+            ok: true,
+            tree: true,
+            message: !!this.validationMessage
+        };
+        this.ui.setVisibilities(visibilities);
+        super.update();
+    }
+    _registerListeners() {
+    }
+    _registerAutoruns() {
+        this.registerVisibleAutorun(reader => {
+            const value = this._value.read(reader);
+            this.ui.inputBox.value = value;
+            this.ui.tree.filter(value);
+        });
+        this.registerVisibleAutorun(reader => {
+            let ariaLabel = this._ariaLabel.read(reader);
+            if (!ariaLabel) {
+                ariaLabel = this.placeholder || QuickTree.DEFAULT_ARIA_LABEL;
+                if (this.title) {
+                    ariaLabel += ` - ${this.title}`;
+                }
+            }
+            if (this.ui.list.ariaLabel !== ariaLabel) {
+                this.ui.list.ariaLabel = ariaLabel ?? null;
+            }
+            if (this.ui.inputBox.ariaLabel !== ariaLabel) {
+                this.ui.inputBox.ariaLabel = ariaLabel ?? 'input';
+            }
+        });
+        this.registerVisibleAutorun(reader => {
+            const placeholder = this._placeholder.read(reader);
+            if (this.ui.inputBox.placeholder !== placeholder) {
+                this.ui.inputBox.placeholder = placeholder ?? '';
+            }
+        });
+        this.registerVisibleAutorun((reader) => {
+            const matchOnLabel = this._matchOnLabel.read(reader);
+            const matchOnDescription = this._matchOnDescription.read(reader);
+            const matchOnDetail = this._matchOnDetail.read(reader);
+            this.ui.tree.updateFilterOptions({ matchOnLabel, matchOnDescription, matchOnDetail });
+        });
+        this.registerVisibleAutorun((reader) => {
+            const itemTree = this._itemTree.read(reader);
+            this.ui.tree.setTreeData(itemTree);
+        });
+    }
+    registerVisibleAutorun(fn) {
+        this._register(autorun((reader) => {
+            if (this._visible.read(reader)) {
+                fn(reader);
+            }
+        }));
+    }
+    focus(focus) {
+        this.ui.tree.focus(focus);
+        this.ui.tree.tree.domFocus();
+    }
+    accept(_inBackground) {
+    }
+}
+
+export { QuickTree };

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-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/base/common/fuzzyScorer";
+import { IItemAccessor } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-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";
@@ -100,7 +100,8 @@ export interface IQuickInputHideEvent {
 export declare enum QuickInputType {
     QuickPick = "quickPick",
     InputBox = "inputBox",
-    QuickWidget = "quickWidget"
+    QuickWidget = "quickWidget",
+    QuickTree = "quickTree"
 }
 export interface IQuickInput extends IDisposable {
     readonly type: QuickInputType;
@@ -263,3 +264,46 @@ export declare class QuickPickItemScorerAccessor implements IItemAccessor<IQuick
 }
 export declare const quickPickItemScorerAccessor: QuickPickItemScorerAccessor;
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+export interface IQuickTree<T extends IQuickTreeItem> extends IQuickInput {
+    readonly type: QuickInputType.QuickTree;
+    value: string;
+    ariaLabel: string | undefined;
+    placeholder: string | undefined;
+    readonly onDidChangeValue: Event<string>;
+    readonly onDidAccept: Event<void>;
+    matchOnDescription: boolean;
+    matchOnDetail: boolean;
+    matchOnLabel: boolean;
+    activeItems: ReadonlyArray<T>;
+    validationMessage: string | undefined;
+    severity: Severity;
+    readonly itemTree: ReadonlyArray<Readonly<T>>;
+    readonly checkedLeafItems: ReadonlyArray<T>;
+    getParent(element: T): T | undefined;
+    readonly onDidChangeActive: Event<ReadonlyArray<T>>;
+    readonly onDidChangeCheckedLeafItems: Event<ReadonlyArray<T>>;
+    readonly onDidTriggerItemButton: Event<IQuickTreeItemButtonEvent<T>>;
+    setItemTree(itemTree: T[]): void;
+    setCheckboxState(element: T, checked: boolean | "partial"): void;
+    expand(element: T): void;
+    collapse(element: T): void;
+    isCollapsed(element: T): boolean;
+    focusOnInput(): void;
+    focus(focus: QuickPickFocus): void;
+    accept(inBackground?: boolean): void;
+}
+export interface IQuickTreeItem extends IQuickPickItem {
+    checked?: boolean | "partial";
+    detail?: undefined;
+    picked?: undefined;
+    collapsed?: boolean;
+    children?: readonly IQuickTreeItem[];
+}
+export interface IQuickTreeCheckboxEvent<T extends IQuickTreeItem> {
+    item: T;
+    checked: boolean | "partial";
+}
+export interface IQuickTreeItemButtonEvent<T extends IQuickTreeItem> {
+    button: IQuickInputButton;
+    item: T;
+}

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

@@ -13,6 +13,7 @@ var QuickInputType;
     QuickInputType["QuickPick"] = "quickPick";
     QuickInputType["InputBox"] = "inputBox";
     QuickInputType["QuickWidget"] = "quickWidget";
+    QuickInputType["QuickTree"] = "quickTree";
 })(QuickInputType || (QuickInputType = {}));
 var ItemActivation;
 (function (ItemActivation) {

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

@@ -1,7 +1,7 @@
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { Event } from "../../../base/common/event.js";
 import { IQuickAccessController } from "./quickAccess.js";
-import { IQuickInputButton, IQuickPickItem, QuickPickInput, IPickOptions, Omit, IInputOptions, IQuickPick, IInputBox, IQuickWidget, IQuickNavigateConfiguration, IKeyMods, IQuickInput } from "./quickInput.js";
+import { IQuickInputButton, IQuickPickItem, QuickPickInput, IPickOptions, Omit, IInputOptions, IQuickPick, IInputBox, IQuickWidget, IQuickTreeItem, IQuickTree, IQuickNavigateConfiguration, IKeyMods, IQuickInput } from "./quickInput.js";
 export declare const IQuickInputService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IQuickInputService>;
 export interface IQuickInputService {
     readonly _serviceBrand: undefined;
@@ -29,6 +29,7 @@ export interface IQuickInputService {
     }>;
     createInputBox(): IInputBox;
     createQuickWidget(): IQuickWidget;
+    createQuickTree<T extends IQuickTreeItem>(): IQuickTree<T>;
     focus(): void;
     toggle(): void;
     navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void;

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

@@ -108,7 +108,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
         {
             id: 'http',
             order: 15,
-            title: ( localize(1991, "HTTP")),
+            title: ( localize(2007, "HTTP")),
             type: 'object',
             scope: ConfigurationScope.MACHINE,
             properties: {
@@ -116,7 +116,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: useHostProxyDefault,
                     markdownDescription: ( localize(
-                        1992,
+                        2008,
                         "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(1991, "HTTP")),
+            title: ( localize(2007, "HTTP")),
             type: 'object',
             scope: ConfigurationScope.APPLICATION,
             properties: {
@@ -134,7 +134,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: false,
                     description: ( localize(
-                        1993,
+                        2009,
                         "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(1991, "HTTP")),
+            title: ( localize(2007, "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(
-                        1994,
+                        2010,
                         "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(
-                        1995,
+                        2011,
                         "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(
-                        1996,
+                        2012,
                         "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(
-                        1997,
+                        2013,
                         "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(
-                        1998,
+                        2014,
                         "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(1999, "Disable proxy support for extensions.")),
-                        ( localize(2000, "Enable proxy support for extensions.")),
+                        ( localize(2015, "Disable proxy support for extensions.")),
+                        ( localize(2016, "Enable proxy support for extensions.")),
                         ( localize(
-                        2001,
+                        2017,
                         "Enable proxy support for extensions, fall back to request options, when no proxy found."
                     )),
-                        ( localize(2002, "Enable proxy support for extensions, override request options.")),
+                        ( localize(2018, "Enable proxy support for extensions, override request options.")),
                     ],
                     default: 'override',
                     markdownDescription: ( localize(
-                        2003,
+                        2019,
                         "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(
-                        2004,
+                        2020,
                         "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(
-                        2005,
+                        2021,
                         "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(
-                        2006,
+                        2022,
                         "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/telemetry/common/telemetryUtils.js

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

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

@@ -1,4 +1,4 @@
-import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableCollection, IEnvironmentVariableMutator, ISerializableEnvironmentDescriptionMap as ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
+import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableCollection, IEnvironmentVariableMutator, ISerializableEnvironmentDescriptionMap as ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/platform/terminal/common/environmentVariable";
 export declare function serializeEnvironmentVariableCollection(collection: ReadonlyMap<string, IEnvironmentVariableMutator>): ISerializableEnvironmentVariableCollection;
 export declare function serializeEnvironmentDescriptionMap(descriptionMap: ReadonlyMap<string, IEnvironmentVariableCollectionDescription> | undefined): ISerializableEnvironmentDescriptionMap;
 export declare function deserializeEnvironmentVariableCollection(serializedCollection: ISerializableEnvironmentVariableCollection): Map<string, IEnvironmentVariableMutator>;

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

@@ -4,7 +4,7 @@ import { URI, UriComponents } from "../../../base/common/uri.js";
 import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability, ITerminalCapabilityStore, type ITerminalCommand } from "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { IProcessDetails } from "./terminalProcess.js";
 import { ThemeIcon } from "../../../base/common/themables.js";
-import { ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
+import { ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/platform/terminal/common/environmentVariable";
 import { RawContextKey } from "../../contextkey/common/contextkey.js";
 import { IWorkspaceFolder } from "../../workspace/common/workspace.js";
 import type * as performance from "../../../base/common/performance.js";
@@ -135,7 +135,7 @@ export declare enum GeneralShellType {
     NuShell = "nu",
     Node = "node"
 }
-export type TerminalShellType = PosixShellType | WindowsShellType | GeneralShellType;
+export type TerminalShellType = PosixShellType | WindowsShellType | GeneralShellType | undefined;
 export interface IRawTerminalInstanceLayoutInfo<T> {
     relativeSize: number;
     terminal: T;
@@ -226,6 +226,9 @@ export interface IFixedTerminalDimensions {
     cols?: number;
     rows?: number;
 }
+export interface ITerminalLaunchResult {
+    injectedArgs: string[];
+}
 export interface IPtyServiceContribution {
     handleProcessReady(persistentProcessId: number, process: ITerminalChildProcess): void;
     handleProcessDispose(persistentProcessId: number): void;
@@ -414,9 +417,7 @@ export interface ITerminalChildProcess {
     onDidChangeProperty: Event<IProcessProperty<any>>;
     onProcessExit: Event<number | undefined>;
     onRestoreCommands?: Event<ISerializedCommandDetectionCapability>;
-    start(): Promise<ITerminalLaunchError | {
-        injectedArgs: string[];
-    } | undefined>;
+    start(): Promise<ITerminalLaunchError | ITerminalLaunchResult | undefined>;
     detach?(forcePersist?: boolean): Promise<void>;
     freePortKillProcess?(port: string): Promise<{
         port: string;

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

@@ -3,7 +3,7 @@ import * as performance from "../../../base/common/performance.js";
 import { IProcessEnvironment, OperatingSystem } from "../../../base/common/platform.js";
 import { ILogService } from "../../log/common/log.service.js";
 import { IPtyHostProcessReplayEvent } from "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
-import { IProcessDataEvent, IProcessReadyEvent, IProcessProperty, IShellLaunchConfig, ITerminalProcessOptions, IPtyHostLatencyMeasurement, ITerminalLaunchError, TitleEventSource, TerminalIcon, ITerminalsLayoutInfo, ISerializedTerminalState, ProcessPropertyType, IProcessPropertyMap, type IPtyHostService } from "./terminal.js";
+import { IProcessDataEvent, IProcessReadyEvent, IProcessProperty, IShellLaunchConfig, ITerminalProcessOptions, IPtyHostLatencyMeasurement, ITerminalLaunchError, ITerminalLaunchResult, TitleEventSource, TerminalIcon, ITerminalsLayoutInfo, ISerializedTerminalState, ProcessPropertyType, IProcessPropertyMap, type IPtyHostService } from "./terminal.js";
 import { IProcessDetails, ISetTerminalLayoutInfoArgs, IGetTerminalLayoutInfoArgs } from "./terminalProcess.js";
 export interface IPtyService {
     readonly _serviceBrand: undefined;
@@ -42,9 +42,7 @@ export interface IPtyService {
     listProcesses(): Promise<IProcessDetails[]>;
     getPerformanceMarks(): Promise<performance.PerformanceMark[]>;
     getLatency(): Promise<IPtyHostLatencyMeasurement[]>;
-    start(id: number): Promise<ITerminalLaunchError | {
-        injectedArgs: string[];
-    } | undefined>;
+    start(id: number): Promise<ITerminalLaunchError | ITerminalLaunchResult | undefined>;
     shutdown(id: number, immediate: boolean): Promise<void>;
     input(id: number, data: string): Promise<void>;
     sendSignal(id: number, signal: string): Promise<void>;

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

@@ -1,5 +1,5 @@
 import { UriComponents } from "../../../base/common/uri.js";
-import { ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
+import { ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/platform/terminal/common/environmentVariable";
 import { IFixedTerminalDimensions, IRawTerminalTabLayoutInfo, IReconnectionProperties, ITerminalEnvironment, ITerminalTabAction, ITerminalTabLayoutInfoById, TerminalIcon, TerminalType, TitleEventSource, WaitOnExitValue } from "./terminal.js";
 export interface ISingleTerminalConfiguration<T> {
     userValue: T | undefined;

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-33de3d75-8b1a-53f0-9e27-0c71c327e1a1-common/vscode/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget";
+import { IBreadcrumbsWidgetStyles } from "@codingame/monaco-vscode-615ce609-8555-545a-a549-47bd9f80e9f8-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";

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

@@ -62,13 +62,13 @@ class ColorRegistry extends Disposable {
         }
         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(2060, 'This color must be transparent or it will obscure content'));
+            propertySchema.patternErrorMessage = ( localize(2076, '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(2061, 'Use the default color.')) }
+                { type: 'string', const: DEFAULT_COLOR_CONFIG_VALUE, description: ( localize(2077, '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(
- 2062,
+ 2078,
  "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(
- 2063,
+ 2079,
  "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(
- 2064,
+ 2080,
  "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(
- 2065,
+ 2081,
  "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(2066, "The default color for icons in the workbench.")));
+const iconForeground = registerColor('icon.foreground', { dark: '#C5C5C5', light: '#424242', hcDark: '#FFFFFF', hcLight: '#292929' }, ( localize(2082, "The default color for icons in the workbench.")));
 const focusBorder = registerColor('focusBorder', { dark: '#007FD4', light: '#0090F1', hcDark: '#F38518', hcLight: '#006BBD' }, ( localize(
- 2067,
+ 2083,
  "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(
- 2068,
+ 2084,
  "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(
- 2069,
+ 2085,
  "An extra border around active elements to separate them from others for greater contrast."
 )));
 const selectionBackground = registerColor('selection.background', null, ( localize(
- 2070,
+ 2086,
  "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(2071, "Foreground color for links in text.")));
+const textLinkForeground = registerColor('textLink.foreground', { light: '#006AB1', dark: '#3794FF', hcDark: '#21A6FF', hcLight: '#0F4A85' }, ( localize(2087, "Foreground color for links in text.")));
 const textLinkActiveForeground = registerColor('textLink.activeForeground', { light: '#006AB1', dark: '#3794FF', hcDark: '#21A6FF', hcLight: '#0F4A85' }, ( localize(
- 2072,
+ 2088,
  "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(2073, "Color for text separators.")));
-registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' }, ( localize(2074, "Foreground color for preformatted text segments.")));
-registerColor('textPreformat.background', { light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' }, ( localize(2075, "Background color for preformatted text segments.")));
-const textBlockQuoteBackground = registerColor('textBlockQuote.background', { light: '#f2f2f2', dark: '#222222', hcDark: null, hcLight: '#F2F2F2' }, ( localize(2076, "Background color for block quotes in text.")));
-const textBlockQuoteBorder = registerColor('textBlockQuote.border', { light: '#007acc80', dark: '#007acc80', hcDark: Color.white, hcLight: '#292929' }, ( localize(2077, "Border color for block quotes in text.")));
-registerColor('textCodeBlock.background', { light: '#dcdcdc66', dark: '#0a0a0a66', hcDark: Color.black, hcLight: '#F2F2F2' }, ( localize(2078, "Background color for code blocks in text.")));
+registerColor('textSeparator.foreground', { light: '#0000002e', dark: '#ffffff2e', hcDark: Color.black, hcLight: '#292929' }, ( localize(2089, "Color for text separators.")));
+registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' }, ( localize(2090, "Foreground color for preformatted text segments.")));
+registerColor('textPreformat.background', { light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' }, ( localize(2091, "Background color for preformatted text segments.")));
+const textBlockQuoteBackground = registerColor('textBlockQuote.background', { light: '#f2f2f2', dark: '#222222', hcDark: null, hcLight: '#F2F2F2' }, ( localize(2092, "Background color for block quotes in text.")));
+const textBlockQuoteBorder = registerColor('textBlockQuote.border', { light: '#007acc80', dark: '#007acc80', hcDark: Color.white, hcLight: '#292929' }, ( localize(2093, "Border color for block quotes in text.")));
+registerColor('textCodeBlock.background', { light: '#dcdcdc66', dark: '#0a0a0a66', hcDark: Color.black, hcLight: '#F2F2F2' }, ( localize(2094, "Background color for code blocks in text.")));
 
 export { activeContrastBorder, contrastBorder, descriptionForeground, disabledForeground, errorForeground, focusBorder, foreground, iconForeground, selectionBackground, textBlockQuoteBackground, textBlockQuoteBorder, textLinkActiveForeground, textLinkForeground };

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

@@ -5,13 +5,13 @@ import { foreground } from './baseColors.js';
 import { editorErrorForeground, editorInfoForeground, editorWarningForeground } from './editorColors.js';
 import { minimapFindMatch } from './minimapColors.js';
 
-registerColor('charts.foreground', foreground, ( localize(2079, "The foreground color used in charts.")));
-registerColor('charts.lines', ( transparent(foreground, .5)), ( localize(2080, "The color used for horizontal lines in charts.")));
-const chartsRed = registerColor('charts.red', editorErrorForeground, ( localize(2081, "The red color used in chart visualizations.")));
-const chartsBlue = registerColor('charts.blue', editorInfoForeground, ( localize(2082, "The blue color used in chart visualizations.")));
-const chartsYellow = registerColor('charts.yellow', editorWarningForeground, ( localize(2083, "The yellow color used in chart visualizations.")));
-registerColor('charts.orange', minimapFindMatch, ( localize(2084, "The orange color used in chart visualizations.")));
-const chartsGreen = registerColor('charts.green', { dark: '#89D185', light: '#388A34', hcDark: '#89D185', hcLight: '#374e06' }, ( localize(2085, "The green color used in chart visualizations.")));
-const chartsPurple = registerColor('charts.purple', { dark: '#B180D7', light: '#652D90', hcDark: '#B180D7', hcLight: '#652D90' }, ( localize(2086, "The purple color used in chart visualizations.")));
+registerColor('charts.foreground', foreground, ( localize(2095, "The foreground color used in charts.")));
+registerColor('charts.lines', ( transparent(foreground, .5)), ( localize(2096, "The color used for horizontal lines in charts.")));
+const chartsRed = registerColor('charts.red', editorErrorForeground, ( localize(2097, "The red color used in chart visualizations.")));
+const chartsBlue = registerColor('charts.blue', editorInfoForeground, ( localize(2098, "The blue color used in chart visualizations.")));
+const chartsYellow = registerColor('charts.yellow', editorWarningForeground, ( localize(2099, "The yellow color used in chart visualizations.")));
+registerColor('charts.orange', minimapFindMatch, ( localize(2100, "The orange color used in chart visualizations.")));
+const chartsGreen = registerColor('charts.green', { dark: '#89D185', light: '#388A34', hcDark: '#89D185', hcLight: '#374e06' }, ( localize(2101, "The green color used in chart visualizations.")));
+const chartsPurple = registerColor('charts.purple', { dark: '#B180D7', light: '#652D90', hcDark: '#B180D7', hcLight: '#652D90' }, ( localize(2102, "The purple color used in chart visualizations.")));
 
 export { chartsBlue, chartsGreen, chartsPurple, chartsRed, chartsYellow };