@codingame/monaco-vscode-api 26.2.1 → 27.0.0

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { $ as $$1, onDidRegisterWindow, onWillUnregisterWindow, getWindow, EventType, addDisposableListener, append, trackFocus, isAncestor, isHTMLElement, reset, isAncestorOfActiveElement, addDisposableGenericMouseUpListener, addDisposableGenericMouseDownListener, addDisposableGenericMouseMoveListener, getActiveWindow } from '../../../base/browser/dom.js';
+import { $ as $$1, onDidRegisterWindow, onWillUnregisterWindow, getWindow, EventType, addDisposableListener, append, trackFocus, isAncestor, isHTMLElement, reset, isAncestorOfActiveElement, getActiveWindow, addDisposableGenericMouseUpListener, addDisposableGenericMouseDownListener, addDisposableGenericMouseMoveListener } from '../../../base/browser/dom.js';
 import { createStyleSheet } from '../../../base/browser/domStylesheets.js';
 import { ToolBar } from '../../../base/browser/ui/toolbar/toolbar.js';
 import { Button } from '../../../base/browser/ui/button/button.js';
@@ -35,6 +35,8 @@ import { createToggleActionViewItemProvider, TriStateCheckbox } from '../../../b
 import { defaultCheckboxStyles } from '../../theme/browser/defaultStyles.js';
 import { QuickInputTreeController } from './tree/quickInputTreeController.js';
 import { QuickTree } from './tree/quickTree.js';
+import { layout2d, AnchorPosition, AnchorAlignment } from '../../../base/common/layout.js';
+import { getAnchorRect } from '../../../base/browser/ui/contextview/contextview.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.service.js';
 import { autorun } from '../../../base/common/observableInternal/reactions/autorun.js';
 import { observableValue } from '../../../base/common/observableInternal/observables/observableValue.js';
@@ -155,7 +157,7 @@ let QuickInputController = class QuickInputController extends Disposable {
         })));
         rightActionBar.getElement().classList.add("quick-input-right-action-bar");
         const headerContainer = append(container, $(".quick-input-header"));
-        const checkAll = this._register(( new TriStateCheckbox(( localize(2032, "Toggle all checkboxes")), false, {
+        const checkAll = this._register(( new TriStateCheckbox(( localize(2068, "Toggle all checkboxes")), false, {
             ...defaultCheckboxStyles,
             size: 15
         })));
@@ -178,12 +180,12 @@ let QuickInputController = class QuickInputController extends Disposable {
         visibleCountContainer.setAttribute("aria-live", "polite");
         visibleCountContainer.setAttribute("aria-atomic", "true");
         const visibleCount = this._register(( new CountBadge(visibleCountContainer, {
-            countFormat: ( localize(2033, "{0} Results"))
+            countFormat: ( localize(2069, "{0} Results"))
         }, this.styles.countBadge)));
         const countContainer = append(filterContainer, $(".quick-input-count"));
         countContainer.setAttribute("aria-live", "polite");
         const count = this._register(( new CountBadge(countContainer, {
-            countFormat: ( localize(2034, "{0} Selected"))
+            countFormat: ( localize(2070, "{0} Selected"))
         }, this.styles.countBadge)));
         const inlineActionBar = this._register(( new ToolBar(headerContainer, this.contextMenuService, {
             hoverDelegate: this.options.hoverDelegate,
@@ -194,7 +196,7 @@ let QuickInputController = class QuickInputController extends Disposable {
         inlineActionBar.getElement().classList.add("quick-input-inline-action-bar");
         const okContainer = append(headerContainer, $(".quick-input-action"));
         const ok = this._register(( new Button(okContainer, this.styles.button)));
-        ok.label = ( localize(2035, "OK"));
+        ok.label = ( localize(2071, "OK"));
         this._register(ok.onDidClick(e => {
             this.onDidAcceptEmitter.fire();
         }));
@@ -203,7 +205,7 @@ let QuickInputController = class QuickInputController extends Disposable {
             ...this.styles.button,
             supportIcons: true
         })));
-        customButton.label = ( localize(2036, "Custom"));
+        customButton.label = ( localize(2072, "Custom"));
         this._register(customButton.onDidClick(e => {
             this.onDidCustomEmitter.fire();
         }));
@@ -228,8 +230,10 @@ let QuickInputController = class QuickInputController extends Disposable {
                 const activeDescendant = list.getActiveDescendant();
                 if (activeDescendant) {
                     inputBox.setAttribute("aria-activedescendant", activeDescendant);
+                    inputBox.setListFocusMode(true);
                 } else {
                     inputBox.removeAttribute("aria-activedescendant");
+                    inputBox.setListFocusMode(false);
                 }
             }
         }));
@@ -264,8 +268,10 @@ let QuickInputController = class QuickInputController extends Disposable {
                 const activeDescendant = tree.getActiveDescendant();
                 if (activeDescendant) {
                     inputBox.setAttribute("aria-activedescendant", activeDescendant);
+                    inputBox.setListFocusMode(true);
                 } else {
                     inputBox.removeAttribute("aria-activedescendant");
+                    inputBox.setListFocusMode(false);
                 }
             }
         }));
@@ -313,6 +319,7 @@ let QuickInputController = class QuickInputController extends Disposable {
             }
             if (!isModifierKey(e.keyCode)) {
                 inputBox.removeAttribute("aria-activedescendant");
+                inputBox.setListFocusMode(false);
             }
         }));
         this._register(addDisposableListener(container, EventType.FOCUS, e => {
@@ -481,6 +488,7 @@ let QuickInputController = class QuickInputController extends Disposable {
             input.quickNavigate = options.quickNavigate;
             input.hideInput = !!options.hideInput;
             input.contextKey = options.contextKey;
+            input.anchor = options.anchor;
             input.busy = true;
             Promise.all([picks, options.activeItem]).then(([items, _activeItem]) => {
                 activeItem = _activeItem;
@@ -624,9 +632,10 @@ let QuickInputController = class QuickInputController extends Disposable {
         ui.inputBox.toggles = undefined;
         ui.inputBox.actions = undefined;
         const backKeybindingLabel = this.options.backKeybindingLabel();
-        backButton.tooltip = backKeybindingLabel ? ( localize(2037, "Back ({0})", backKeybindingLabel)) : ( localize(2038, "Back"));
+        backButton.tooltip = backKeybindingLabel ? ( localize(2073, "Back ({0})", backKeybindingLabel)) : ( localize(2074, "Back"));
         ui.container.style.display = "";
         this.updateLayout();
+        this.dndController?.setEnabled(!controller.anchor);
         this.dndController?.layoutContainer();
         ui.inputBox.setFocus();
         this.quickInputTypeContext.set(controller.type);
@@ -764,18 +773,59 @@ let QuickInputController = class QuickInputController extends Disposable {
     updateLayout() {
         if (this.ui && this.isVisible()) {
             const style = this.ui.container.style;
-            const width = Math.min(
+            let width = Math.min(
                 this.dimension.width * 0.62,
                 QuickInputController_1.MAX_WIDTH
             );
             style.width = width + "px";
-            style.top = `${this.viewState?.top ? Math.round(this.dimension.height * this.viewState.top) : this.titleBarOffset}px`;
-            style.left = `${Math.round(
+            let listHeight = this.dimension && this.dimension.height * 0.4;
+            if (this.controller?.anchor) {
+                const container = this.layoutService.getContainer(getActiveWindow()).getBoundingClientRect();
+                const anchor = getAnchorRect(this.controller.anchor);
+                width = 380;
+                listHeight = this.dimension ? Math.min(this.dimension.height * 0.2, 200) : 200;
+                const containerHeight = Math.floor(listHeight) + 6 + 26 + 16;
+                const {
+                    top,
+                    left,
+                    right,
+                    bottom,
+                    anchorAlignment,
+                    anchorPosition
+                } = layout2d(container, {
+                    width,
+                    height: containerHeight
+                }, anchor, {
+                    anchorPosition: AnchorPosition.ABOVE
+                });
+                if (anchorAlignment === AnchorAlignment.RIGHT) {
+                    style.right = `${right}px`;
+                    style.left = "initial";
+                } else {
+                    style.left = `${left}px`;
+                    style.right = "initial";
+                }
+                if (anchorPosition === AnchorPosition.ABOVE) {
+                    style.bottom = `${bottom}px`;
+                    style.top = "initial";
+                } else {
+                    style.top = `${top}px`;
+                    style.bottom = "initial";
+                }
+                style.width = `${width}px`;
+                style.height = "";
+            } else {
+                style.top = `${this.viewState?.top ? Math.round(this.dimension.height * this.viewState.top) : this.titleBarOffset}px`;
+                style.left = `${Math.round(
     (this.dimension.width * (this.viewState?.left ?? 0.5) ) - (width / 2)
 )}px`;
+                style.right = "";
+                style.bottom = "";
+                style.height = "";
+            }
             this.ui.inputBox.layout();
-            this.ui.list.layout(this.dimension && this.dimension.height * 0.4);
-            this.ui.tree.layout(this.dimension && this.dimension.height * 0.4);
+            this.ui.list.layout(listHeight);
+            this.ui.tree.layout(listHeight);
         }
     }
     applyStyles(styles) {
@@ -891,6 +941,7 @@ let QuickInputDragAndDropController = class QuickInputDragAndDropController exte
         this._layoutService = _layoutService;
         this.configurationService = configurationService;
         this.dndViewState = observableValue(this, undefined);
+        this._enabled = true;
         this._snapThreshold = 20;
         this._snapLineHorizontalRatio = 0.25;
         this._quickInputAlignmentContext = QuickInputAlignmentContextKey.bindTo(contextKeyService);
@@ -908,6 +959,9 @@ let QuickInputDragAndDropController = class QuickInputDragAndDropController exte
         this._container = container;
     }
     layoutContainer(dimension = this._layoutService.activeContainerDimension) {
+        if (!this._enabled) {
+            return;
+        }
         const state = this.dndViewState.get();
         const dragAreaRect = this._quickInputContainer.getBoundingClientRect();
         if (state?.top && state?.left) {
@@ -918,6 +972,10 @@ let QuickInputDragAndDropController = class QuickInputDragAndDropController exte
             this._layout(state.top * dimension.height, d);
         }
     }
+    setEnabled(enabled) {
+        this._enabled = enabled;
+        this._quickInputContainer.classList.toggle("no-drag", !enabled);
+    }
     setAlignment(alignment, done = true) {
         if (alignment === "top") {
             this.dndViewState.set({
@@ -951,6 +1009,9 @@ let QuickInputDragAndDropController = class QuickInputDragAndDropController exte
     registerMouseListeners() {
         const dragArea = this._quickInputContainer;
         this._register(addDisposableGenericMouseUpListener(dragArea, event => {
+            if (!this._enabled) {
+                return;
+            }
             const originEvent = ( new StandardMouseEvent(getWindow(dragArea), event));
             if (originEvent.detail !== 2) {
                 return;
@@ -971,6 +1032,9 @@ let QuickInputDragAndDropController = class QuickInputDragAndDropController exte
             }, undefined);
         }));
         this._register(addDisposableGenericMouseDownListener(dragArea, e => {
+            if (!this._enabled) {
+                return;
+            }
             const activeWindow = getWindow(this._layoutService.activeContainer);
             const originEvent = ( new StandardMouseEvent(activeWindow, e));
             const area = this._quickInputDragAreas.find((

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

@@ -194,7 +194,7 @@ class QuickInputItemDelegate {
 }
 class QuickInputAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(2039, "Quick Input");
+        return localize(2075, "Quick Input");
     }
     getAriaLabel(element) {
         return element.separator?.label ? `${element.saneAriaLabel}, ${element.separator.label}` : element.saneAriaLabel;
@@ -542,9 +542,9 @@ let QuickInputList = class QuickInputList extends Disposable {
         this.linkOpenerDelegate = linkOpenerDelegate;
         this.styles = styles;
         this.accessibilityService = accessibilityService;
-        this._onKeyDown = ( new Emitter());
+        this._onKeyDown = this._register(( new Emitter()));
         this.onKeyDown = this._onKeyDown.event;
-        this._onLeave = ( new Emitter());
+        this._onLeave = this._register(( new Emitter()));
         this.onLeave = this._onLeave.event;
         this._visibleCountObservable = observableValue("VisibleCount", 0);
         this.onChangedVisibleCount = Event.fromObservable(this._visibleCountObservable, this._store);
@@ -556,11 +556,11 @@ let QuickInputList = class QuickInputList extends Disposable {
             equalsFn: equals
         }, ( new Array()));
         this.onChangedCheckedElements = Event.fromObservable(this._checkedElementsObservable, this._store);
-        this._onButtonTriggered = ( new Emitter());
+        this._onButtonTriggered = this._register(( new Emitter()));
         this.onButtonTriggered = this._onButtonTriggered.event;
-        this._onSeparatorButtonTriggered = ( new Emitter());
+        this._onSeparatorButtonTriggered = this._register(( new Emitter()));
         this.onSeparatorButtonTriggered = this._onSeparatorButtonTriggered.event;
-        this._elementChecked = ( new Emitter());
+        this._elementChecked = this._register(( new Emitter()));
         this._elementCheckedEventBufferer = ( new EventBufferer());
         this._hasCheckboxes = false;
         this._inputElements = ( new Array());

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

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

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

@@ -42,7 +42,7 @@ function _formatPinnedItems(storageKey, quickPick, storageService, changedItem,
     if (pinnedItems.length) {
         formattedItems.push({
             type: "separator",
-            label: ( localize(2041, "pinned"))
+            label: ( localize(2077, "pinned"))
         });
     }
     const pinnedIds = ( new Set());
@@ -76,7 +76,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(2042, "Pin command")) : ( localize(2043, "Pinned command")),
+        tooltip: removePin ? ( localize(2078, "Pin command")) : ( localize(2079, "Pinned command")),
         alwaysVisible: false
     });
     item.buttons = newButtons;

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

@@ -8,7 +8,7 @@ class QuickTreeAccessibilityProvider {
         this.onCheckedEvent = onCheckedEvent;
     }
     getWidgetAriaLabel() {
-        return localize(2044, "Quick Tree");
+        return localize(2080, "Quick Tree");
     }
     getAriaLabel(element) {
         return element.ariaLabel || ( [element.label, element.description].map(s => getCodiconAriaLabel(s))).filter(s => !!s).join(", ");

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

@@ -47,7 +47,7 @@ let QuickInputTreeController = class QuickInputTreeController extends Disposable
         this.onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
         this._onDidCheckedLeafItemsChange = this._register(( new Emitter()));
         this.onDidChangeCheckedLeafItems = this._onDidCheckedLeafItemsChange.event;
-        this._onLeave = ( new Emitter());
+        this._onLeave = this._register(( new Emitter()));
         this.onLeave = this._onLeave.event;
         this._onDidAccept = this._register(( new Emitter()));
         this.onDidAccept = this._onDidAccept.event;

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

@@ -11,7 +11,7 @@ import { autorun } from '../../../../base/common/observableInternal/reactions/au
 
 class QuickTree extends QuickInput {
     static {
-        this.DEFAULT_ARIA_LABEL = ( localize(2045, "Type to narrow down results."));
+        this.DEFAULT_ARIA_LABEL = ( localize(2081, "Type to narrow down results."));
     }
     constructor(ui) {
         super(ui);

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

@@ -166,6 +166,13 @@ export interface IPickOptions<T extends IQuickPickItem> {
      * an optional property for the item to focus initially.
      */
     activeItem?: Promise<T> | T;
+    /**
+     * an optional anchor for the picker
+     */
+    anchor?: HTMLElement | {
+        x: number;
+        y: number;
+    };
     onKeyMods?: (keyMods: IKeyMods) => void;
     onDidFocus?: (entry: T) => void;
     onDidTriggerItemButton?: (context: IQuickPickItemButtonContext<T>) => void;
@@ -297,6 +304,13 @@ export interface IQuickInput extends IDisposable {
      * Indicates whether the quick input should be hidden when it loses focus.
      */
     ignoreFocusOut: boolean;
+    /**
+     * An optional anchor for the quick input.
+     */
+    anchor?: HTMLElement | {
+        x: number;
+        y: number;
+    };
     /**
      * Shows the quick input.
      */

package/vscode/src/vs/platform/remote/common/remoteHosts.d.ts

@@ -3,6 +3,19 @@ export declare function getRemoteAuthority(uri: URI): string | undefined;
 export declare function getRemoteName(authority: string): string;
 export declare function getRemoteName(authority: undefined): undefined;
 export declare function getRemoteName(authority: string | undefined): string | undefined;
+/**
+ * Returns the suffix part of the authority after the '+' character.
+ * For remote connections, this is typically the server/tunnel identifier.
+ * Examples:
+ * - For tunnels: `tunnel+myTunnel` returns `myTunnel`
+ * - For SSH: `ssh+myserver` returns `myserver`
+ * - For localhost: `localhost:8000` returns `undefined`
+ * @param authority The remote authority string.
+ * @returns The suffix after the '+' character, or undefined if there is no '+' character.
+ */
+export declare function getRemoteServerRootPath(authority: string): string | undefined;
+export declare function getRemoteServerRootPath(authority: undefined): undefined;
+export declare function getRemoteServerRootPath(authority: string | undefined): string | undefined;
 export declare function parseAuthorityWithPort(authority: string): {
     host: string;
     port: number;

package/vscode/src/vs/platform/remote/common/remoteHosts.js

@@ -14,6 +14,16 @@ function getRemoteName(authority) {
     }
     return authority.substr(0, pos);
 }
+function getRemoteServerRootPath(authority) {
+    if (!authority) {
+        return undefined;
+    }
+    const pos = authority.indexOf("+");
+    if (pos < 0) {
+        return undefined;
+    }
+    return authority.substring(pos + 1);
+}
 function parseAuthorityWithOptionalPort(authority, defaultPort) {
     let {
         host,
@@ -55,4 +65,4 @@ function parseAuthority(authority) {
     };
 }
 
-export { getRemoteAuthority, getRemoteName, parseAuthorityWithOptionalPort };
+export { getRemoteAuthority, getRemoteName, getRemoteServerRootPath, parseAuthorityWithOptionalPort };

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

@@ -113,7 +113,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
     proxyConfiguration = [{
         id: "http",
         order: 15,
-        title: ( localize(2046, "HTTP")),
+        title: ( localize(2082, "HTTP")),
         type: "object",
         scope: ConfigurationScope.MACHINE,
         properties: {
@@ -121,7 +121,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "boolean",
                 default: useHostProxyDefault,
                 markdownDescription: ( localize(
-                    2047,
+                    2083,
                     "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
@@ -130,7 +130,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
     }, {
         id: "http",
         order: 15,
-        title: ( localize(2046, "HTTP")),
+        title: ( localize(2082, "HTTP")),
         type: "object",
         scope: ConfigurationScope.APPLICATION,
         properties: {
@@ -138,7 +138,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "boolean",
                 default: false,
                 description: ( localize(
-                    2048,
+                    2084,
                     "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
@@ -147,7 +147,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
     }, {
         id: "http",
         order: 15,
-        title: ( localize(2046, "HTTP")),
+        title: ( localize(2082, "HTTP")),
         type: "object",
         scope: useHostProxy ? ConfigurationScope.APPLICATION : ConfigurationScope.MACHINE,
         properties: {
@@ -155,7 +155,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "string",
                 pattern: "^(https?|socks|socks4a?|socks5h?)://([^:]*(:[^@]*)?@)?([^:]+|\\[[:0-9a-fA-F]+\\])(:\\d+)?/?$|^$",
                 markdownDescription: ( localize(
-                    2049,
+                    2085,
                     "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#`"
                 )),
@@ -165,7 +165,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "boolean",
                 default: true,
                 markdownDescription: ( localize(
-                    2050,
+                    2086,
                     "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#`"
                 )),
@@ -174,7 +174,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
             "http.proxyKerberosServicePrincipal": {
                 type: "string",
                 markdownDescription: ( localize(
-                    2051,
+                    2087,
                     "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#`"
                 )),
@@ -186,7 +186,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: "string"
                 },
                 markdownDescription: ( localize(
-                    2052,
+                    2088,
                     "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#`"
                 )),
@@ -196,7 +196,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: ["null", "string"],
                 default: null,
                 markdownDescription: ( localize(
-                    2053,
+                    2089,
                     "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#`"
                 )),
@@ -205,13 +205,13 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
             "http.proxySupport": {
                 type: "string",
                 enum: ["off", "on", "fallback", "override"],
-                enumDescriptions: [( localize(2054, "Disable proxy support for extensions.")), ( localize(2055, "Enable proxy support for extensions.")), ( localize(
-                    2056,
+                enumDescriptions: [( localize(2090, "Disable proxy support for extensions.")), ( localize(2091, "Enable proxy support for extensions.")), ( localize(
+                    2092,
                     "Enable proxy support for extensions, fall back to request options, when no proxy found."
-                )), ( localize(2057, "Enable proxy support for extensions, override request options."))],
+                )), ( localize(2093, "Enable proxy support for extensions, override request options."))],
                 default: "override",
                 markdownDescription: ( localize(
-                    2058,
+                    2094,
                     "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(
-                    2059,
+                    2095,
                     "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: systemCertificatesNodeDefault,
                 markdownDescription: ( localize(
-                    2060,
+                    2096,
                     "Controls whether system certificates should be loaded using Node.js built-in support. Reload the window after changing this setting. 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#`"
                 )),
@@ -246,7 +246,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 tags: ["experimental"],
                 default: false,
                 markdownDescription: ( localize(
-                    2061,
+                    2097,
                     "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#`"
                 )),
@@ -256,7 +256,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "boolean",
                 default: true,
                 markdownDescription: ( localize(
-                    2062,
+                    2098,
                     "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#`",
@@ -270,7 +270,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 minimum: -1,
                 tags: ["experimental"],
                 markdownDescription: ( localize(
-                    2063,
+                    2099,
                     "Controls the interval in seconds for checking network interface changes to invalidate the proxy cache. Set to -1 to disable. 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#`"
                 )),

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

@@ -36,7 +36,7 @@ class NullEndpointTelemetryService {
 const telemetryLogId = "telemetry";
 const TelemetryLogGroup = {
     id: telemetryLogId,
-    name: ( localize(2084, "Telemetry"))
+    name: ( localize(2120, "Telemetry"))
 };
 function supportsTelemetry(productService, environmentService) {
     if (!environmentService.isBuilt && !environmentService.disableTelemetry) {
@@ -164,6 +164,7 @@ function anonymizeFilePaths(stack, cleanupPatterns) {
         }
     }
     const nodeModulesRegex = /^[\\\/]?(node_modules|node_modules\.asar)[\\\/]/;
+    const vscodeExtensionsPathRegex = /^(.*?)((?:\.vscode(?:-[a-z]+)*|resources[\\\/]app)[\\\/]extensions[\\\/].*)$/i;
     const fileRegex = /(file:\/\/)?([a-zA-Z]:(\\\\|\\|\/)|(\\\\|\\|\/))?([\w-\._]+(\\\\|\\|\/))+[\w-\._]*/g;
     let lastIndex = 0;
     updatedStack = "";
@@ -174,7 +175,12 @@ function anonymizeFilePaths(stack, cleanupPatterns) {
         }
         const overlappingRange = ( cleanUpIndexes.some(([start, end]) => result.index < end && start < fileRegex.lastIndex));
         if (!nodeModulesRegex.test(result[0]) && !overlappingRange) {
-            updatedStack += stack.substring(lastIndex, result.index) + "<REDACTED: user-file-path>";
+            const vscodeExtMatch = vscodeExtensionsPathRegex.exec(result[0]);
+            if (vscodeExtMatch) {
+                updatedStack += stack.substring(lastIndex, result.index) + "<REDACTED: user-file-path>/" + vscodeExtMatch[2];
+            } else {
+                updatedStack += stack.substring(lastIndex, result.index) + "<REDACTED: user-file-path>";
+            }
             lastIndex = fileRegex.lastIndex;
         }
     }

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

@@ -55,6 +55,7 @@ export declare enum TerminalSettingId {
     FontWeight = "terminal.integrated.fontWeight",
     FontWeightBold = "terminal.integrated.fontWeightBold",
     CursorBlinking = "terminal.integrated.cursorBlinking",
+    TextBlinking = "terminal.integrated.textBlinking",
     CursorStyle = "terminal.integrated.cursorStyle",
     CursorStyleInactive = "terminal.integrated.cursorStyleInactive",
     CursorWidth = "terminal.integrated.cursorWidth",
@@ -266,7 +267,7 @@ export interface IPtyServiceContribution {
     handleProcessReady(persistentProcessId: number, process: ITerminalChildProcess): void;
     handleProcessDispose(persistentProcessId: number): void;
     handleProcessInput(persistentProcessId: number, data: string): void;
-    handleProcessResize(persistentProcessId: number, cols: number, rows: number): void;
+    handleProcessResize(persistentProcessId: number, cols: number, rows: number, pixelWidth?: number, pixelHeight?: number): void;
 }
 export interface IPtyHostController {
     readonly onPtyHostExit: Event<number>;
@@ -510,6 +511,12 @@ export interface IShellLaunchConfig {
      * This allows extensions to control shell integration for terminals they create.
      */
     shellIntegrationNonce?: string;
+    /**
+     * A title template string that supports the same variables as the
+     * `terminal.integrated.tabs.title` setting. When set, this overrides the config-based
+     * title template for this terminal instance.
+     */
+    titleTemplate?: string;
 }
 export interface ITerminalTabAction {
     id: string;
@@ -530,6 +537,7 @@ export interface ICreateContributedTerminalProfileOptions {
         splitActiveTerminal: boolean;
     };
     cwd?: string | URI;
+    titleTemplate?: string;
 }
 export declare enum TerminalLocation {
     Panel = 1,
@@ -556,6 +564,7 @@ export interface IShellLaunchConfigDto {
     isFeatureTerminal?: boolean;
     tabActions?: ITerminalTabAction[];
     shellIntegrationEnvironmentReporting?: boolean;
+    titleTemplate?: string;
 }
 /**
  * A set of options for the terminal process. These differ from the shell launch config in that they
@@ -644,7 +653,7 @@ export interface ITerminalChildProcess {
     input(data: string): void;
     sendSignal(signal: string): void;
     processBinary(data: string): Promise<void>;
-    resize(cols: number, rows: number): void;
+    resize(cols: number, rows: number, pixelWidth?: number, pixelHeight?: number): void;
     clearBuffer(): void | Promise<void>;
     /**
      * Acknowledge a data event has been parsed by the terminal, this is used to implement flow
@@ -788,6 +797,7 @@ export interface ITerminalProfileContribution {
         dark: URI;
     } | string;
     color?: string;
+    titleTemplate?: string;
 }
 export interface IExtensionTerminalProfile extends ITerminalProfileContribution {
     extensionIdentifier: string;

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

@@ -48,6 +48,7 @@ var TerminalSettingId;
     TerminalSettingId["FontWeight"] = "terminal.integrated.fontWeight";
     TerminalSettingId["FontWeightBold"] = "terminal.integrated.fontWeightBold";
     TerminalSettingId["CursorBlinking"] = "terminal.integrated.cursorBlinking";
+    TerminalSettingId["TextBlinking"] = "terminal.integrated.textBlinking";
     TerminalSettingId["CursorStyle"] = "terminal.integrated.cursorStyle";
     TerminalSettingId["CursorStyleInactive"] = "terminal.integrated.cursorStyleInactive";
     TerminalSettingId["CursorWidth"] = "terminal.integrated.cursorWidth";

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

@@ -55,7 +55,7 @@ export interface IPtyService {
     shutdown(id: number, immediate: boolean): Promise<void>;
     input(id: number, data: string): Promise<void>;
     sendSignal(id: number, signal: string): Promise<void>;
-    resize(id: number, cols: number, rows: number): Promise<void>;
+    resize(id: number, cols: number, rows: number, pixelWidth?: number, pixelHeight?: number): Promise<void>;
     clearBuffer(id: number): Promise<void>;
     getInitialCwd(id: number): Promise<string>;
     getCwd(id: number): Promise<string>;