@codingame/monaco-vscode-api 8.0.4 → 9.0.0

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

@@ -1,11 +1,13 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { addStandardDisposableListener, asCSSUrl, append, EventType, prepend, addDisposableListener, isHTMLAnchorElement, isAncestor, $ as $$1 } from '../../../base/browser/dom.js';
 import { Emitter, Event, 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 { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
 import { KeyCode } from '../../../base/common/keyCodes.js';
 import { OS } from '../../../base/common/platform.js';
@@ -24,9 +26,8 @@ import { ltrim } from '../../../base/common/strings.js';
 import { RenderIndentGuides } from '../../../base/browser/ui/tree/abstractTree.js';
 import { ThrottledDelayer } from '../../../base/common/async.js';
 import { isCancellationError } from '../../../base/common/errors.js';
-import { QuickPickFocus } from '../common/quickInput.js';
 import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
-import { observableValue } from '../../../base/common/observableInternal/base.js';
+import { observableValue, transaction } from '../../../base/common/observableInternal/base.js';
 import '../../../base/common/observableInternal/derived.js';
 import '../../../base/common/observableInternal/autorun.js';
 import '../../../base/common/observableInternal/utils.js';
@@ -185,7 +186,7 @@ class QuickInputItemDelegate {
 }
 class QuickInputAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(9964, "Quick Input"));
+        return ( localize(11159, "Quick Input"));
     }
     getAriaLabel(element) {
         return element.separator?.label
@@ -403,6 +404,11 @@ class QuickPickSeparatorElementRenderer extends BaseQuickInputListRenderer {
              (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;
@@ -526,6 +532,24 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         this._separatorRenderer = ( (new QuickPickSeparatorElementRenderer(hoverDelegate)));
         this._itemRenderer = instantiationService.createInstance(QuickPickItemElementRenderer, hoverDelegate);
         this._tree = this._register(instantiationService.createInstance((WorkbenchObjectTree), 'QuickInput', this._container, ( (new QuickInputItemDelegate())), [this._itemRenderer, this._separatorRenderer], {
+            filter: {
+                filter(element) {
+                    return element.hidden
+                        ? TreeVisibility.Hidden
+                        : element instanceof QuickPickSeparatorElement
+                            ? TreeVisibility.Recurse
+                            : TreeVisibility.Visible;
+                },
+            },
+            sorter: {
+                compare: (element, otherElement) => {
+                    if (!this.sortByLabel || !this._lastQueryString) {
+                        return 0;
+                    }
+                    const normalizedSearchValue = this._lastQueryString.toLowerCase();
+                    return compareEntries(element, otherElement, normalizedSearchValue);
+                },
+            },
             accessibilityProvider: ( (new QuickInputAccessibilityProvider())),
             setRowLineHeight: false,
             multipleSelectionSupport: false,
@@ -781,6 +805,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
     }
     setElements(inputElements) {
         this._elementDisposable.clear();
+        this._lastQueryString = undefined;
         this._inputElements = inputElements;
         this._hasCheckboxes = this.parent.classList.contains('show-checkboxes');
         let currentSeparatorElement;
@@ -1059,6 +1084,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         this._tree.layout();
     }
     filter(query) {
+        this._lastQueryString = query;
         if (!(this._sortByLabel || this._matchOnLabel || this._matchOnDescription || this._matchOnDetail)) {
             this._tree.layout();
             return false;
@@ -1079,7 +1105,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         }
         else {
             let currentSeparator;
-            this._elementTree.forEach(element => {
+            this._itemElements.forEach(element => {
                 let labelHighlights;
                 if (this.matchOnLabelMode === 'fuzzy') {
                     labelHighlights = this.matchOnLabel ? matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneLabel)) ?? undefined : undefined;
@@ -1108,8 +1134,10 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                     element.hidden = true;
                 }
                 if (!this.sortByLabel) {
-                    const previous = element.index && this._inputElements[element.index - 1];
-                    currentSeparator = previous && previous.type === 'separator' ? previous : currentSeparator;
+                    const previous = element.index && this._inputElements[element.index - 1] || undefined;
+                    if (previous?.type === 'separator' && !previous.buttons) {
+                        currentSeparator = previous;
+                    }
                     if (currentSeparator && !element.hidden) {
                         element.separator = currentSeparator;
                         currentSeparator = undefined;
@@ -1117,31 +1145,9 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                 }
             });
         }
-        const shownElements = this._elementTree.filter(element => !element.hidden);
-        if (this.sortByLabel && query) {
-            const normalizedSearchValue = query.toLowerCase();
-            shownElements.sort((a, b) => {
-                return compareEntries(a, b, normalizedSearchValue);
-            });
-        }
-        let currentSeparator;
-        const finalElements = shownElements.reduce((result, element, index) => {
-            if (element instanceof QuickPickItemElement) {
-                if (currentSeparator) {
-                    currentSeparator.children.push(element);
-                }
-                else {
-                    result.push(element);
-                }
-            }
-            else if (element instanceof QuickPickSeparatorElement) {
-                element.children = [];
-                currentSeparator = element;
-                result.push(element);
-            }
-            return result;
-        }, ( (new Array())));
-        this._setElementsToTree(finalElements);
+        this._setElementsToTree(this._sortByLabel && query
+            ? this._itemElements
+            : this._elementTree);
         this._tree.layout();
         return true;
     }
@@ -1220,10 +1226,12 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         return whenNoneVisible;
     }
     _updateCheckedObservables() {
-        this._allVisibleCheckedObservable.set(this._allVisibleChecked(this._itemElements, false), undefined);
-        const checkedCount = this._itemElements.filter(element => element.checked).length;
-        this._checkedCountObservable.set(checkedCount, undefined);
-        this._checkedElementsObservable.set(this.getCheckedElements(), undefined);
+        transaction((tx) => {
+            this._allVisibleCheckedObservable.set(this._allVisibleChecked(this._itemElements, false), tx);
+            const checkedCount = this._itemElements.filter(element => element.checked).length;
+            this._checkedCountObservable.set(checkedCount, tx);
+            this._checkedElementsObservable.set(this.getCheckedElements(), tx);
+        });
     }
     showHover(element) {
         if (this._lastHover && !this._lastHover.isDisposed) {

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

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

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

@@ -2,30 +2,33 @@ import { Codicon } from '../../../base/common/codicons.js';
 import { localize } from '../../../nls.js';
 import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
 const pinButtonClass = ThemeIcon.asClassName(Codicon.pin);
 const pinnedButtonClass = ThemeIcon.asClassName(Codicon.pinned);
 const buttonClasses = [pinButtonClass, pinnedButtonClass];
-async function showWithPinnedItems(storageService, storageKey, quickPick, filterDuplicates) {
+function showWithPinnedItems(storageService, storageKey, quickPick, filterDuplicates) {
     const itemsWithoutPinned = quickPick.items;
     let itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, undefined);
-    quickPick.onDidTriggerItemButton(async (buttonEvent) => {
+    const disposables = ( (new DisposableStore()));
+    disposables.add(quickPick.onDidTriggerItemButton(async (buttonEvent) => {
         const expectedButton = buttonEvent.button.iconClass && buttonClasses.includes(buttonEvent.button.iconClass);
         if (expectedButton) {
             quickPick.items = itemsWithoutPinned;
             itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, buttonEvent.item);
             quickPick.items = quickPick.value ? itemsWithoutPinned : itemsWithPinned;
         }
-    });
-    quickPick.onDidChangeValue(async (value) => {
+    }));
+    disposables.add(quickPick.onDidChangeValue(async (value) => {
         if (quickPick.items === itemsWithPinned && value) {
             quickPick.items = itemsWithoutPinned;
         }
         else if (quickPick.items === itemsWithoutPinned && !value) {
             quickPick.items = itemsWithPinned;
         }
-    });
+    }));
     quickPick.items = quickPick.value ? itemsWithoutPinned : itemsWithPinned;
     quickPick.show();
+    return disposables;
 }
 function _formatPinnedItems(storageKey, quickPick, storageService, changedItem, filterDuplicates) {
     const formattedItems = [];
@@ -37,7 +40,7 @@ function _formatPinnedItems(storageKey, quickPick, storageService, changedItem,
         pinnedItems = getPinnedItems(storageKey, storageService);
     }
     if (pinnedItems.length) {
-        formattedItems.push({ type: 'separator', label: ( localize(11363, 'pinned')) });
+        formattedItems.push({ type: 'separator', label: ( localize(11424, 'pinned')) });
     }
     const pinnedIds = ( (new Set()));
     for (const itemToFind of pinnedItems) {
@@ -68,7 +71,7 @@ function updateButtons(item, removePin) {
     const newButtons = item.buttons?.filter(button => button.iconClass && !buttonClasses.includes(button.iconClass)) ?? [];
     newButtons.unshift({
         iconClass: removePin ? pinButtonClass : pinnedButtonClass,
-        tooltip: removePin ? ( localize(11364, "Pin command")) : ( localize(11365, "Pinned command")),
+        tooltip: removePin ? ( localize(11425, "Pin command")) : ( localize(11426, "Pinned command")),
         alwaysVisible: false
     });
     item.buttons = newButtons;

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

@@ -63,6 +63,10 @@ interface IPickOptions<T extends IQuickPickItem> {
      * an optional string to show as the title of the quick input
      */
     title?: string;
+    /**
+     * the value to prefill in the input box
+     */
+    value?: string;
     /**
      * an optional string to show as placeholder in the input box to guide the user what she picks on
      */
@@ -351,7 +355,11 @@ declare enum QuickPickFocus {
 /**
  * Represents a quick pick control that allows the user to select an item from a list of options.
  */
-interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
+interface IQuickPick<T extends IQuickPickItem, O extends {
+    useSeparators: boolean;
+} = {
+    useSeparators: false;
+}> extends IQuickInput {
     /**
      * The type of the quick input.
      */
@@ -421,7 +429,9 @@ interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
     /**
      * The items to be displayed in the quick pick.
      */
-    items: ReadonlyArray<T | IQuickPickSeparator>;
+    items: O extends {
+        useSeparators: true;
+    } ? ReadonlyArray<T | IQuickPickSeparator> : ReadonlyArray<T>;
     /**
      * Whether multiple items can be selected. If so, checkboxes will be rendered.
      */

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

@@ -41,7 +41,16 @@ interface IQuickInputService {
     /**
     * Provides raw access to the quick pick controller.
     */
-    createQuickPick<T extends IQuickPickItem>(): IQuickPick<T>;
+    createQuickPick<T extends IQuickPickItem>(options: {
+        useSeparators: true;
+    }): IQuickPick<T, {
+        useSeparators: true;
+    }>;
+    createQuickPick<T extends IQuickPickItem>(options?: {
+        useSeparators: boolean;
+    }): IQuickPick<T, {
+        useSeparators: false;
+    }>;
     /**
     * Provides raw access to the input box controller.
     */

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

@@ -30,7 +30,7 @@ class AbstractRequestService extends Disposable {
         super();
         this.counter = 0;
         this.logger = loggerService.createLogger('network', {
-            name: ( localize(4590, "Network Requests")),
+            name: ( localize(4644, "Network Requests")),
             when: ( (CONTEXT_LOG_LEVEL.isEqualTo(LogLevelToString(LogLevel.Trace)))).serialize()
         });
     }
@@ -93,7 +93,7 @@ function registerProxyConfigurations(scope) {
     proxyConfiguration = {
         id: 'http',
         order: 15,
-        title: ( localize(4591, "HTTP")),
+        title: ( localize(4645, "HTTP")),
         type: 'object',
         scope,
         properties: {
@@ -101,7 +101,7 @@ function registerProxyConfigurations(scope) {
                 type: 'string',
                 pattern: '^(https?|socks|socks4a?|socks5h?)://([^:]*(:[^@]*)?@)?([^:]+|\\[[:0-9a-fA-F]+\\])(:\\d+)?/?$|^$',
                 markdownDescription: ( localize(
-                    4592,
+                    4646,
                     "The proxy setting to use. If not set, will be inherited from the `http_proxy` and `https_proxy` environment variables."
                 )),
                 restricted: true
@@ -110,7 +110,7 @@ function registerProxyConfigurations(scope) {
                 type: 'boolean',
                 default: true,
                 description: ( localize(
-                    4593,
+                    4647,
                     "Controls whether the proxy server certificate should be verified against the list of supplied CAs."
                 )),
                 restricted: true
@@ -118,7 +118,7 @@ function registerProxyConfigurations(scope) {
             'http.proxyKerberosServicePrincipal': {
                 type: 'string',
                 markdownDescription: ( localize(
-                    4594,
+                    4648,
                     "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."
                 )),
                 restricted: true
@@ -127,7 +127,7 @@ function registerProxyConfigurations(scope) {
                 type: 'array',
                 items: { type: 'string' },
                 markdownDescription: ( localize(
-                    4595,
+                    4649,
                     "Specifies domain names for which proxy settings should be ignored for HTTP/HTTPS requests."
                 )),
                 restricted: true
@@ -136,7 +136,7 @@ function registerProxyConfigurations(scope) {
                 type: ['null', 'string'],
                 default: null,
                 markdownDescription: ( localize(
-                    4596,
+                    4650,
                     "The value to send as the `Proxy-Authorization` header for every network request."
                 )),
                 restricted: true
@@ -145,23 +145,23 @@ function registerProxyConfigurations(scope) {
                 type: 'string',
                 enum: ['off', 'on', 'fallback', 'override'],
                 enumDescriptions: [
-                    ( localize(4597, "Disable proxy support for extensions.")),
-                    ( localize(4598, "Enable proxy support for extensions.")),
+                    ( localize(4651, "Disable proxy support for extensions.")),
+                    ( localize(4652, "Enable proxy support for extensions.")),
                     ( localize(
-                        4599,
+                        4653,
                         "Enable proxy support for extensions, fall back to request options, when no proxy found."
                     )),
-                    ( localize(4600, "Enable proxy support for extensions, override request options.")),
+                    ( localize(4654, "Enable proxy support for extensions, override request options.")),
                 ],
                 default: 'override',
-                description: ( localize(4601, "Use the proxy support for extensions.")),
+                description: ( localize(4655, "Use the proxy support for extensions.")),
                 restricted: true
             },
             'http.systemCertificates': {
                 type: 'boolean',
                 default: true,
                 description: ( localize(
-                    4602,
+                    4656,
                     "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.)"
                 )),
                 restricted: true
@@ -171,7 +171,7 @@ function registerProxyConfigurations(scope) {
                 tags: ['experimental'],
                 default: false,
                 description: ( localize(
-                    4603,
+                    4657,
                     "Controls whether experimental loading of CA certificates from the OS should be enabled. This uses a more general approach than the default implemenation."
                 )),
                 restricted: true

package/vscode/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.d.ts

@@ -4,7 +4,7 @@ import { Event } from '../../../../../base/common/event.js';
  * A model of the prompt input state using shell integration and analyzing the terminal buffer. This
  * may not be 100% accurate but provides a best guess.
  */
-interface IPromptInputModel {
+interface IPromptInputModel extends IPromptInputModelState {
     readonly onDidStartInput: Event<IPromptInputModelState>;
     readonly onDidChangeInput: Event<IPromptInputModelState>;
     readonly onDidFinishInput: Event<IPromptInputModelState>;
@@ -12,9 +12,6 @@ interface IPromptInputModel {
      * Fires immediately before {@link onDidFinishInput} when a SIGINT/Ctrl+C/^C is detected.
      */
     readonly onDidInterrupt: Event<IPromptInputModelState>;
-    readonly value: string;
-    readonly cursorIndex: number;
-    readonly ghostTextIndex: number;
     /**
      * Gets the prompt input as a user-friendly string where `|` is the cursor position and `[` and
      * `]` wrap any ghost text.
@@ -22,8 +19,26 @@ interface IPromptInputModel {
     getCombinedString(): string;
 }
 interface IPromptInputModelState {
+    /**
+     * The full prompt input include ghost text.
+     */
     readonly value: string;
+    /**
+     * The prompt input up to the cursor index, this will always exclude the ghost text.
+     */
+    readonly prefix: string;
+    /**
+     * The prompt input from the cursor to the end, this _does not_ include ghost text.
+     */
+    readonly suffix: string;
+    /**
+     * The index of the cursor in {@link value}.
+     */
     readonly cursorIndex: number;
+    /**
+     * The index of the start of ghost text in {@link value}. This is -1 when there is no ghost
+     * text.
+     */
     readonly ghostTextIndex: number;
 }
 interface ISerializedPromptInputModel {

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

@@ -9,23 +9,25 @@ import { IWorkspaceFolder } from '../../workspace/common/workspace.js';
 import { PerformanceMark } from '../../../base/common/performance.js';
 
 declare const enum PosixShellType {
-    PowerShell = "pwsh",
     Bash = "bash",
     Fish = "fish",
     Sh = "sh",
     Csh = "csh",
     Ksh = "ksh",
-    Zsh = "zsh",
-    Python = "python"
+    Zsh = "zsh"
 }
 declare const enum WindowsShellType {
     CommandPrompt = "cmd",
-    PowerShell = "pwsh",
     Wsl = "wsl",
-    GitBash = "gitbash",
-    Python = "python"
+    GitBash = "gitbash"
+}
+declare const enum GeneralShellType {
+    PowerShell = "pwsh",
+    Python = "python",
+    Julia = "julia",
+    NuShell = "nu"
 }
-type TerminalShellType = PosixShellType | WindowsShellType;
+type TerminalShellType = PosixShellType | WindowsShellType | GeneralShellType;
 interface IRawTerminalInstanceLayoutInfo<T> {
     relativeSize: number;
     terminal: T;
@@ -287,6 +289,7 @@ interface ITerminalProcessOptions {
         nonce: string;
     };
     windowsEnableConpty: boolean;
+    windowsUseConptyDll: boolean;
     environmentVariableCollections: ISerializableEnvironmentVariableCollections | undefined;
     workspaceFolder: IWorkspaceFolder | undefined;
 }
@@ -583,4 +586,4 @@ interface ITerminalBackend {
     restartPtyHost(): void;
 }
 
-export { type IBaseUnresolvedTerminalProfile, type IExtensionTerminalProfile, type IFixedTerminalDimensions, type IProcessDataEvent, type IProcessProperty, type IProcessPropertyMap, type IProcessReadyEvent, type IProcessReadyWindowsPty, type IPtyHostAttachTarget, type IPtyHostLatencyMeasurement, type IRawTerminalInstanceLayoutInfo, type IRawTerminalTabLayoutInfo, type IRawTerminalsLayoutInfo, type IReconnectionProperties, type IShellIntegration, type IShellLaunchConfig, type ITerminalBackend, type ITerminalChildProcess, type ITerminalDimensions, type ITerminalDimensionsOverride, type ITerminalEnvironment, type ITerminalExecutable, type ITerminalLaunchError, type ITerminalOutputMatch, type ITerminalOutputMatcher, type ITerminalProcessOptions, type ITerminalProfile, type ITerminalProfileContribution, type ITerminalProfileObject, type ITerminalProfileSource, type ITerminalTabLayoutInfoById, type ITerminalUnsafePath, type ITerminalsLayoutInfo, type ITerminalsLayoutInfoById, PosixShellType, ProcessPropertyType, ProfileSource, ShellIntegrationStatus, TerminalExitReason, type TerminalIcon, TerminalLocation, TerminalLocationString, type TerminalShellType, type TerminalType, TitleEventSource, type WaitOnExitValue, WindowsShellType };
+export { GeneralShellType, type IBaseUnresolvedTerminalProfile, type IExtensionTerminalProfile, type IFixedTerminalDimensions, type IProcessDataEvent, type IProcessProperty, type IProcessPropertyMap, type IProcessReadyEvent, type IProcessReadyWindowsPty, type IPtyHostAttachTarget, type IPtyHostLatencyMeasurement, type IRawTerminalInstanceLayoutInfo, type IRawTerminalTabLayoutInfo, type IRawTerminalsLayoutInfo, type IReconnectionProperties, type IShellIntegration, type IShellLaunchConfig, type ITerminalBackend, type ITerminalChildProcess, type ITerminalDimensions, type ITerminalDimensionsOverride, type ITerminalEnvironment, type ITerminalExecutable, type ITerminalLaunchError, type ITerminalOutputMatch, type ITerminalOutputMatcher, type ITerminalProcessOptions, type ITerminalProfile, type ITerminalProfileContribution, type ITerminalProfileObject, type ITerminalProfileSource, type ITerminalTabLayoutInfoById, type ITerminalUnsafePath, type ITerminalsLayoutInfo, type ITerminalsLayoutInfoById, PosixShellType, ProcessPropertyType, ProfileSource, ShellIntegrationStatus, TerminalExitReason, type TerminalIcon, TerminalLocation, TerminalLocationString, type TerminalShellType, type TerminalType, TitleEventSource, type WaitOnExitValue, WindowsShellType };

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

@@ -73,6 +73,7 @@ var TerminalSettingId;
     TerminalSettingId["EnvWindows"] = "terminal.integrated.env.windows";
     TerminalSettingId["EnvironmentChangesIndicator"] = "terminal.integrated.environmentChangesIndicator";
     TerminalSettingId["EnvironmentChangesRelaunch"] = "terminal.integrated.environmentChangesRelaunch";
+    TerminalSettingId["ExperimentalWindowsUseConptyDll"] = "terminal.integrated.experimental.windowsUseConptyDll";
     TerminalSettingId["ShowExitAlert"] = "terminal.integrated.showExitAlert";
     TerminalSettingId["SplitCwd"] = "terminal.integrated.splitCwd";
     TerminalSettingId["WindowsEnableConpty"] = "terminal.integrated.windowsEnableConpty";
@@ -104,23 +105,26 @@ var TerminalSettingId;
 })(TerminalSettingId || (TerminalSettingId = {})));
 var PosixShellType;
 ( (function(PosixShellType) {
-    PosixShellType["PowerShell"] = "pwsh";
     PosixShellType["Bash"] = "bash";
     PosixShellType["Fish"] = "fish";
     PosixShellType["Sh"] = "sh";
     PosixShellType["Csh"] = "csh";
     PosixShellType["Ksh"] = "ksh";
     PosixShellType["Zsh"] = "zsh";
-    PosixShellType["Python"] = "python";
 })(PosixShellType || (PosixShellType = {})));
 var WindowsShellType;
 ( (function(WindowsShellType) {
     WindowsShellType["CommandPrompt"] = "cmd";
-    WindowsShellType["PowerShell"] = "pwsh";
     WindowsShellType["Wsl"] = "wsl";
     WindowsShellType["GitBash"] = "gitbash";
-    WindowsShellType["Python"] = "python";
 })(WindowsShellType || (WindowsShellType = {})));
+var GeneralShellType;
+( (function(GeneralShellType) {
+    GeneralShellType["PowerShell"] = "pwsh";
+    GeneralShellType["Python"] = "python";
+    GeneralShellType["Julia"] = "julia";
+    GeneralShellType["NuShell"] = "nu";
+})(GeneralShellType || (GeneralShellType = {})));
 var TitleEventSource;
 ( (function(TitleEventSource) {
     TitleEventSource[TitleEventSource["Api"] = 0] = "Api";
@@ -207,4 +211,4 @@ class TerminalBackendRegistry {
     }
 }
 Registry.add(TerminalExtensions.Backend, ( new TerminalBackendRegistry()));
-export { FlowControlConstants, PosixShellType, ProcessPropertyType, ShellIntegrationStatus, TerminalBackendChangeEvent, TerminalExitReason, TerminalExtensions, TerminalLocation, TerminalLocationString, TerminalSettingId, TerminalSettingPrefix, TitleEventSource, WindowsShellType };
+export { FlowControlConstants, GeneralShellType, PosixShellType, ProcessPropertyType, ShellIntegrationStatus, TerminalBackendChangeEvent, TerminalExitReason, TerminalExtensions, TerminalLocation, TerminalLocationString, TerminalSettingId, TerminalSettingPrefix, TitleEventSource, WindowsShellType };

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

@@ -51,18 +51,19 @@ class ColorRegistry {
     registerColor(id, defaults, description, needsTransparency = false, deprecationMessage) {
         const colorContribution = { id, description, defaults, needsTransparency, deprecationMessage };
         this.colorsById[id] = colorContribution;
-        const propertySchema = { type: 'string', description, format: 'color-hex', defaultSnippets: [{ body: '${1:#ff0000}' }] };
+        const propertySchema = { type: 'string', format: 'color-hex', defaultSnippets: [{ body: '${1:#ff0000}' }] };
         if (deprecationMessage) {
             propertySchema.deprecationMessage = deprecationMessage;
         }
         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(1694, 'This color must be transparent or it will obscure content'));
+            propertySchema.patternErrorMessage = ( localize(3353, '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(1695, 'Use the default color.')) }
+                { type: 'string', const: DEFAULT_COLOR_CONFIG_VALUE, description: ( localize(3354, 'Use the default color.')) }
             ]
         };
         this.colorReferenceSchema.enum.push(id);

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

@@ -2,47 +2,47 @@ import { localize } from '../../../../nls.js';
 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(
- 1696,
+ 3355,
  "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(
- 1697,
+ 3356,
  "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(
- 1698,
+ 3357,
  "Overall foreground color for error messages. This color is only used if not overridden by a component."
 )));
 registerColor('descriptionForeground', { light: '#717171', dark: ( (transparent(foreground, 0.7))), hcDark: ( (transparent(foreground, 0.7))), hcLight: ( (transparent(foreground, 0.7))) }, ( localize(
- 1699,
+ 3358,
  "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(1700, "The default color for icons in the workbench.")));
+const iconForeground = registerColor('icon.foreground', { dark: '#C5C5C5', light: '#424242', hcDark: '#FFFFFF', hcLight: '#292929' }, ( localize(3359, "The default color for icons in the workbench.")));
 const focusBorder = registerColor('focusBorder', { dark: '#007FD4', light: '#0090F1', hcDark: '#F38518', hcLight: '#006BBD' }, ( localize(
- 1701,
+ 3360,
  "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(
- 1702,
+ 3361,
  "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(
- 1703,
+ 3362,
  "An extra border around active elements to separate them from others for greater contrast."
 )));
 const selectionBackground = registerColor('selection.background', null, ( localize(
- 1704,
+ 3363,
  "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(1705, "Foreground color for links in text.")));
+const textLinkForeground = registerColor('textLink.foreground', { light: '#006AB1', dark: '#3794FF', hcDark: '#21A6FF', hcLight: '#0F4A85' }, ( localize(3364, "Foreground color for links in text.")));
 const textLinkActiveForeground = registerColor('textLink.activeForeground', { light: '#006AB1', dark: '#3794FF', hcDark: '#21A6FF', hcLight: '#0F4A85' }, ( localize(
- 1706,
+ 3365,
  "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(1707, "Color for text separators.")));
-registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' }, ( localize(1708, "Foreground color for preformatted text segments.")));
-registerColor('textPreformat.background', { light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' }, ( localize(1709, "Background color for preformatted text segments.")));
-const textBlockQuoteBackground = registerColor('textBlockQuote.background', { light: '#f2f2f2', dark: '#222222', hcDark: null, hcLight: '#F2F2F2' }, ( localize(1710, "Background color for block quotes in text.")));
-const textBlockQuoteBorder = registerColor('textBlockQuote.border', { light: '#007acc80', dark: '#007acc80', hcDark: Color.white, hcLight: '#292929' }, ( localize(1711, "Border color for block quotes in text.")));
-registerColor('textCodeBlock.background', { light: '#dcdcdc66', dark: '#0a0a0a66', hcDark: Color.black, hcLight: '#F2F2F2' }, ( localize(1712, "Background color for code blocks in text.")));
+registerColor('textSeparator.foreground', { light: '#0000002e', dark: '#ffffff2e', hcDark: Color.black, hcLight: '#292929' }, ( localize(3366, "Color for text separators.")));
+registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' }, ( localize(3367, "Foreground color for preformatted text segments.")));
+registerColor('textPreformat.background', { light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' }, ( localize(3368, "Background color for preformatted text segments.")));
+const textBlockQuoteBackground = registerColor('textBlockQuote.background', { light: '#f2f2f2', dark: '#222222', hcDark: null, hcLight: '#F2F2F2' }, ( localize(3369, "Background color for block quotes in text.")));
+const textBlockQuoteBorder = registerColor('textBlockQuote.border', { light: '#007acc80', dark: '#007acc80', hcDark: Color.white, hcLight: '#292929' }, ( localize(3370, "Border color for block quotes in text.")));
+registerColor('textCodeBlock.background', { light: '#dcdcdc66', dark: '#0a0a0a66', hcDark: Color.black, hcLight: '#F2F2F2' }, ( localize(3371, "Background color for code blocks in text.")));
 export { activeContrastBorder, contrastBorder, disabledForeground, errorForeground, focusBorder, foreground, iconForeground, selectionBackground, textBlockQuoteBackground, textBlockQuoteBorder, textLinkActiveForeground, textLinkForeground };

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

@@ -3,12 +3,12 @@ import { registerColor, transparent } from '../colorUtils.js';
 import { foreground } from './baseColors.js';
 import { editorErrorForeground, editorInfoForeground, editorWarningForeground } from './editorColors.js';
 import { minimapFindMatch } from './minimapColors.js';
-registerColor('charts.foreground', foreground, ( localize(1713, "The foreground color used in charts.")));
-registerColor('charts.lines', ( (transparent(foreground, .5))), ( localize(1714, "The color used for horizontal lines in charts.")));
-const chartsRed = registerColor('charts.red', editorErrorForeground, ( localize(1715, "The red color used in chart visualizations.")));
-const chartsBlue = registerColor('charts.blue', editorInfoForeground, ( localize(1716, "The blue color used in chart visualizations.")));
-const chartsYellow = registerColor('charts.yellow', editorWarningForeground, ( localize(1717, "The yellow color used in chart visualizations.")));
-const chartsOrange = registerColor('charts.orange', minimapFindMatch, ( localize(1718, "The orange color used in chart visualizations.")));
-const chartsGreen = registerColor('charts.green', { dark: '#89D185', light: '#388A34', hcDark: '#89D185', hcLight: '#374e06' }, ( localize(1719, "The green color used in chart visualizations.")));
-const chartsPurple = registerColor('charts.purple', { dark: '#B180D7', light: '#652D90', hcDark: '#B180D7', hcLight: '#652D90' }, ( localize(1720, "The purple color used in chart visualizations.")));
+registerColor('charts.foreground', foreground, ( localize(3372, "The foreground color used in charts.")));
+registerColor('charts.lines', ( (transparent(foreground, .5))), ( localize(3373, "The color used for horizontal lines in charts.")));
+const chartsRed = registerColor('charts.red', editorErrorForeground, ( localize(3374, "The red color used in chart visualizations.")));
+const chartsBlue = registerColor('charts.blue', editorInfoForeground, ( localize(3375, "The blue color used in chart visualizations.")));
+const chartsYellow = registerColor('charts.yellow', editorWarningForeground, ( localize(3376, "The yellow color used in chart visualizations.")));
+const chartsOrange = registerColor('charts.orange', minimapFindMatch, ( localize(3377, "The orange color used in chart visualizations.")));
+const chartsGreen = registerColor('charts.green', { dark: '#89D185', light: '#388A34', hcDark: '#89D185', hcLight: '#374e06' }, ( localize(3378, "The green color used in chart visualizations.")));
+const chartsPurple = registerColor('charts.purple', { dark: '#B180D7', light: '#652D90', hcDark: '#B180D7', hcLight: '#652D90' }, ( localize(3379, "The purple color used in chart visualizations.")));
 export { chartsBlue, chartsGreen, chartsOrange, chartsPurple, chartsRed, chartsYellow };