@codingame/monaco-vscode-api 28.4.1 → 29.0.0

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { asCSSUrl } from '../../../base/browser/cssValue.js';
-import { $ as $$1, append, addStandardDisposableListener, EventType, prepend, addDisposableListener, isHTMLAnchorElement, isAncestor } from '../../../base/browser/dom.js';
+import { $ as $$1, append, addStandardDisposableListener, EventType, prepend, isAncestorOfActiveElement, addDisposableListener, isHTMLAnchorElement, isAncestor } from '../../../base/browser/dom.js';
 import { ToolBar } from '../../../base/browser/ui/toolbar/toolbar.js';
 import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
 import { IconLabel } from '../../../base/browser/ui/iconLabel/iconLabel.js';
@@ -17,7 +17,7 @@ import { isCancellationError } from '../../../base/common/errors.js';
 import { Event, Emitter, EventBufferer } from '../../../base/common/event.js';
 import { parseLabelWithIcons, getCodiconAriaLabel, matchesFuzzyIconAware } from '../../../base/common/iconLabels.js';
 import { Lazy } from '../../../base/common/lazy.js';
-import { DisposableStore, MutableDisposable, Disposable } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import '../../../base/common/observableInternal/index.js';
 import { OS } from '../../../base/common/platform.js';
 import { escape, ltrim } from '../../../base/common/strings.js';
@@ -194,7 +194,7 @@ class QuickInputItemDelegate {
 }
 class QuickInputAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(2077, "Quick Input");
+        return localize(2082, "Quick Input");
     }
     getAriaLabel(element) {
         return element.separator?.label ? `${element.saneAriaLabel}, ${element.separator.label}` : element.saneAriaLabel;
@@ -217,11 +217,14 @@ class QuickInputAccessibilityProvider {
         };
     }
 }
-class BaseQuickInputListRenderer {
+class BaseQuickInputListRenderer extends Disposable {
     constructor(hoverDelegate, toggleStyles, contextMenuService) {
+        super();
         this.hoverDelegate = hoverDelegate;
         this.toggleStyles = toggleStyles;
         this.contextMenuService = contextMenuService;
+        this._onDidDisposeFocusedElement = this._register(( new Emitter()));
+        this.onDidDisposeFocusedElement = this._onDidDisposeFocusedElement.event;
     }
     renderTemplate(container) {
         const data = Object.create(null);
@@ -277,6 +280,9 @@ class BaseQuickInputListRenderer {
         data.toDisposeTemplate.dispose();
     }
     disposeElement(_element, _index, data) {
+        if (isAncestorOfActiveElement(data.entry)) {
+            this._onDidDisposeFocusedElement.fire();
+        }
         data.toDisposeElement.clear();
         data.toolBar.setActions([]);
     }
@@ -575,8 +581,12 @@ let QuickInputList = class QuickInputList extends Disposable {
         this._sortByLabel = true;
         this._shouldLoop = true;
         this._container = append(this.parent, $(".quick-input-list"));
-        this._separatorRenderer = instantiationService.createInstance(QuickPickSeparatorElementRenderer, hoverDelegate, this.styles.toggle);
-        this._itemRenderer = instantiationService.createInstance(QuickPickItemElementRenderer, hoverDelegate, this.styles.toggle);
+        this._separatorRenderer = this._register(
+            instantiationService.createInstance(QuickPickSeparatorElementRenderer, hoverDelegate, this.styles.toggle)
+        );
+        this._itemRenderer = this._register(
+            instantiationService.createInstance(QuickPickItemElementRenderer, hoverDelegate, this.styles.toggle)
+        );
         this._tree = this._register(
             instantiationService.createInstance(WorkbenchObjectTree, "QuickInput", this._container, ( new QuickInputItemDelegate()), [this._itemRenderer, this._separatorRenderer], {
                 filter: {
@@ -606,6 +616,10 @@ let QuickInputList = class QuickInputList extends Disposable {
             })
         );
         this._tree.getHTMLElement().id = id;
+        this._register(this._itemRenderer.onDidDisposeFocusedElement(() => this._tree.domFocus()));
+        this._register(
+            this._separatorRenderer.onDidDisposeFocusedElement(() => this._tree.domFocus())
+        );
         this._registerListeners();
     }
     get onDidChangeFocus() {

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(
-                    2078,
+                    2083,
                     "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(2079, "pinned"))
+            label: ( localize(2084, "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(2080, "Pin command")) : ( localize(2081, "Pinned command")),
+        tooltip: removePin ? ( localize(2085, "Pin command")) : ( localize(2086, "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(2082, "Quick Tree");
+        return localize(2087, "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

@@ -80,6 +80,9 @@ let QuickInputTreeController = class QuickInputTreeController extends Disposable
                 identityProvider: ( new QuickInputTreeIdentityProvider())
             })
         );
+        this._register(this._renderer.onDidDisposeFocusedElement(() => {
+            this._tree.domFocus();
+        }));
         this.registerCheckboxStateListeners();
         this.registerOnDidChangeFocus();
     }
@@ -230,15 +233,19 @@ Math.floor(maxHeight / 44) * 44 + 6}px` : "";
             this.updateCheckboxState(item, item.checked === true);
         }));
         this._register(this._checkboxStateHandler.onDidChangeCheckboxState(e => {
-            this.updateCheckboxState(e.item, e.checked === true);
+            this.updateCheckboxState(e.item, e.checked === true, true);
+            this._tree.setFocus([e.item]);
+            this._tree.setSelection([e.item]);
         }));
     }
-    updateCheckboxState(item, newState) {
+    updateCheckboxState(item, newState, skipItemRerender = false) {
         if ((item.checked ?? false) === newState) {
             return;
         }
         item.checked = newState;
-        this._tree.rerender(item);
+        if (!skipItemRerender) {
+            this._tree.rerender(item);
+        }
         const updateSet = ( new Set());
         const toUpdate = [...this._tree.getNode(item).children];
         while (toUpdate.length) {

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.d.ts

@@ -36,6 +36,14 @@ export declare class QuickInputTreeRenderer<T extends IQuickTreeItem> extends Di
     private readonly _themeService;
     static readonly ID = "quickInputTreeElement";
     templateId: string;
+    private readonly _onDidDisposeFocusedElement;
+    /**
+     * This event is emitted when the renderer disposes an element that has focus.
+     * This allows the list to re-focus itself and prevent focus from being lost
+     * (potentially causing quickinput to dismiss itself) when an element is
+     * removed while focused.
+     */
+    readonly onDidDisposeFocusedElement: Event<void>;
     constructor(_hoverDelegate: IHoverDelegate | undefined, _buttonTriggeredEmitter: Emitter<IQuickTreeItemButtonEvent<T>>, onCheckedEvent: Event<IQuickTreeCheckboxEvent<T>>, _checkboxStateHandler: QuickInputCheckboxStateHandler<T>, _toggleStyles: IToggleStyles, _contextMenuService: IContextMenuService, _themeService: IThemeService);
     renderTemplate(container: HTMLElement): IQuickTreeTemplateData;
     renderElement(node: ITreeNode<T, IQuickTreeFilterData>, _index: number, templateData: IQuickTreeTemplateData, _details?: ITreeElementRenderDetails): void;

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { asCSSUrl } from '../../../../base/browser/cssValue.js';
-import { $ as $$1, append, prepend } from '../../../../base/browser/dom.js';
+import { $ as $$1, append, prepend, isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
 import { ToolBar } from '../../../../base/browser/ui/toolbar/toolbar.js';
 import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
 import { TriStateCheckbox, createToggleActionViewItemProvider } from '../../../../base/browser/ui/toggle/toggle.js';
@@ -55,6 +55,8 @@ let QuickInputTreeRenderer = class QuickInputTreeRenderer extends Disposable {
         this._contextMenuService = _contextMenuService;
         this._themeService = _themeService;
         this.templateId = QuickInputTreeRenderer_1.ID;
+        this._onDidDisposeFocusedElement = this._register(( new Emitter()));
+        this.onDidDisposeFocusedElement = this._onDidDisposeFocusedElement.event;
     }
     renderTemplate(container) {
         const store = ( new DisposableStore());
@@ -159,6 +161,9 @@ let QuickInputTreeRenderer = class QuickInputTreeRenderer extends Disposable {
         }
     }
     disposeElement(_element, _index, templateData, _details) {
+        if (isAncestorOfActiveElement(templateData.entry)) {
+            this._onDidDisposeFocusedElement.fire();
+        }
         templateData.toDisposeElement.clear();
         templateData.actionBar.setActions([]);
     }

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(2083, "Type to narrow down results."));
+        this.DEFAULT_ARIA_LABEL = ( localize(2088, "Type to narrow down results."));
     }
     constructor(ui) {
         super(ui);

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

@@ -6,6 +6,7 @@ export interface IRemoteAgentEnvironment {
     pid: number;
     connectionToken: string;
     appRoot: URI;
+    execPath: string;
     tmpDir: URI;
     settingsPath: URI;
     mcpResource: URI;

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

@@ -3,6 +3,17 @@ import { Disposable } from "../../../base/common/lifecycle.js";
 import { IRequestContext, IRequestOptions } from "../../../base/parts/request/common/request.js";
 import { ILogService } from "../../log/common/log.service.js";
 import { IRequestService } from "./request.service.js";
+/**
+ * Use as the {@link IRequestOptions.callSite} value to prevent
+ * request telemetry from being emitted. This is needed for
+ * callers such as the telemetry sender to avoid cyclical calls.
+ */
+export declare const NO_FETCH_TELEMETRY = "NO_FETCH_TELEMETRY";
+export interface IRequestCompleteEvent {
+    readonly callSite: string;
+    readonly latency: number;
+    readonly statusCode: number | undefined;
+}
 export interface AuthInfo {
     isProxy: boolean;
     scheme: string;
@@ -19,6 +30,8 @@ export declare abstract class AbstractRequestService extends Disposable implemen
     protected readonly logService: ILogService;
     readonly _serviceBrand: undefined;
     private counter;
+    private readonly _onDidCompleteRequest;
+    readonly onDidCompleteRequest: import("../../../base/common/event.js").Event<IRequestCompleteEvent>;
     constructor(logService: ILogService);
     protected logAndRequest(options: IRequestOptions, request: () => Promise<IRequestContext>): Promise<IRequestContext>;
     abstract request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;

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

@@ -1,11 +1,13 @@
 
 import { streamToBuffer } from '../../../base/common/buffer.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
+import { Emitter } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { localize } from '../../../nls.js';
 import { Extensions, ConfigurationScope } from '../../configuration/common/configurationRegistry.js';
 import { Registry } from '../../registry/common/platform.js';
 
+const NO_FETCH_TELEMETRY = "NO_FETCH_TELEMETRY";
 class LoggableHeaders {
     constructor(original) {
         this.original = original;
@@ -30,13 +32,21 @@ class AbstractRequestService extends Disposable {
         super();
         this.logService = logService;
         this.counter = 0;
+        this._onDidCompleteRequest = this._register(( new Emitter()));
+        this.onDidCompleteRequest = this._onDidCompleteRequest.event;
     }
     async logAndRequest(options, request) {
         const prefix = `#${++this.counter}: ${options.url}`;
         this.logService.trace(`${prefix} - begin`, options.type, ( new LoggableHeaders(options.headers ?? {})));
+        const startTime = Date.now();
         try {
             const result = await request();
             this.logService.trace(`${prefix} - end`, options.type, result.res.statusCode, result.res.headers);
+            this._onDidCompleteRequest.fire({
+                callSite: options.callSite,
+                latency: Date.now() - startTime,
+                statusCode: result.res.statusCode
+            });
             return result;
         } catch (error) {
             this.logService.error(`${prefix} - error`, options.type, getErrorMessage(error));
@@ -113,7 +123,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
     proxyConfiguration = [{
         id: "http",
         order: 15,
-        title: ( localize(2084, "HTTP")),
+        title: ( localize(2089, "HTTP")),
         type: "object",
         scope: ConfigurationScope.MACHINE,
         properties: {
@@ -121,7 +131,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "boolean",
                 default: useHostProxyDefault,
                 markdownDescription: ( localize(
-                    2085,
+                    2090,
                     "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 +140,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
     }, {
         id: "http",
         order: 15,
-        title: ( localize(2084, "HTTP")),
+        title: ( localize(2089, "HTTP")),
         type: "object",
         scope: ConfigurationScope.APPLICATION,
         properties: {
@@ -138,7 +148,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "boolean",
                 default: false,
                 description: ( localize(
-                    2086,
+                    2091,
                     "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 +157,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
     }, {
         id: "http",
         order: 15,
-        title: ( localize(2084, "HTTP")),
+        title: ( localize(2089, "HTTP")),
         type: "object",
         scope: useHostProxy ? ConfigurationScope.APPLICATION : ConfigurationScope.MACHINE,
         properties: {
@@ -155,7 +165,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "string",
                 pattern: "^(https?|socks|socks4a?|socks5h?)://([^:]*(:[^@]*)?@)?([^:]+|\\[[:0-9a-fA-F]+\\])(:\\d+)?/?$|^$",
                 markdownDescription: ( localize(
-                    2087,
+                    2092,
                     "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 +175,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "boolean",
                 default: true,
                 markdownDescription: ( localize(
-                    2088,
+                    2093,
                     "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 +184,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
             "http.proxyKerberosServicePrincipal": {
                 type: "string",
                 markdownDescription: ( localize(
-                    2089,
+                    2094,
                     "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 +196,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: "string"
                 },
                 markdownDescription: ( localize(
-                    2090,
+                    2095,
                     "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 +206,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: ["null", "string"],
                 default: null,
                 markdownDescription: ( localize(
-                    2091,
+                    2096,
                     "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 +215,13 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
             "http.proxySupport": {
                 type: "string",
                 enum: ["off", "on", "fallback", "override"],
-                enumDescriptions: [( localize(2092, "Disable proxy support for extensions.")), ( localize(2093, "Enable proxy support for extensions.")), ( localize(
-                    2094,
+                enumDescriptions: [( localize(2097, "Disable proxy support for extensions.")), ( localize(2098, "Enable proxy support for extensions.")), ( localize(
+                    2099,
                     "Enable proxy support for extensions, fall back to request options, when no proxy found."
-                )), ( localize(2095, "Enable proxy support for extensions, override request options."))],
+                )), ( localize(2100, "Enable proxy support for extensions, override request options."))],
                 default: "override",
                 markdownDescription: ( localize(
-                    2096,
+                    2101,
                     "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 +231,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "boolean",
                 default: true,
                 markdownDescription: ( localize(
-                    2097,
+                    2102,
                     "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 +242,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 tags: ["experimental"],
                 default: systemCertificatesNodeDefault,
                 markdownDescription: ( localize(
-                    2098,
+                    2103,
                     "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 +256,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 tags: ["experimental"],
                 default: false,
                 markdownDescription: ( localize(
-                    2099,
+                    2104,
                     "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 +266,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 type: "boolean",
                 default: true,
                 markdownDescription: ( localize(
-                    2100,
+                    2105,
                     "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#`",
@@ -264,13 +274,25 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 )),
                 restricted: true
             },
+            "http.webSocketAdditionalSupport": {
+                type: "boolean",
+                default: true,
+                markdownDescription: ( localize(
+                    2106,
+                    "Controls whether the built-in WebSocket 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#`",
+                    "`#http.systemCertificates#`"
+                )),
+                restricted: true
+            },
             "http.experimental.networkInterfaceCheckInterval": {
                 type: "number",
                 default: 300,
                 minimum: -1,
                 tags: ["experimental"],
                 markdownDescription: ( localize(
-                    2101,
+                    2107,
                     "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#`"
                 )),
@@ -288,4 +310,4 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
 }
 registerProxyConfigurations();
 
-export { AbstractRequestService, USER_LOCAL_AND_REMOTE_SETTINGS, asJson, asText, asTextOrError, hasNoContent, isClientError, isServerError, isSuccess, systemCertificatesNodeDefault };
+export { AbstractRequestService, NO_FETCH_TELEMETRY, USER_LOCAL_AND_REMOTE_SETTINGS, asJson, asText, asTextOrError, hasNoContent, isClientError, isServerError, isSuccess, systemCertificatesNodeDefault };

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

@@ -1,9 +1,14 @@
 import { CancellationToken } from "../../../base/common/cancellation.js";
+import { Event } from "../../../base/common/event.js";
 import { IRequestOptions, IRequestContext } from "../../../base/parts/request/common/request.js";
-import { AuthInfo, Credentials } from "./request.js";
+import { IRequestCompleteEvent, AuthInfo, Credentials } from "./request.js";
 export declare const IRequestService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IRequestService>;
 export interface IRequestService {
     readonly _serviceBrand: undefined;
+    /**
+    * Fires when a request completes (successfully or with an error response).
+    */
+    readonly onDidCompleteRequest: Event<IRequestCompleteEvent>;
     request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;
     resolveProxy(url: string): Promise<string | undefined>;
     lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;

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

@@ -36,7 +36,7 @@ class NullEndpointTelemetryService {
 const telemetryLogId = "telemetry";
 const TelemetryLogGroup = {
     id: telemetryLogId,
-    name: ( localize(2122, "Telemetry"))
+    name: ( localize(2128, "Telemetry"))
 };
 function supportsTelemetry(productService, environmentService) {
     if (!environmentService.isBuilt && !environmentService.disableTelemetry) {
@@ -163,9 +163,9 @@ function anonymizeFilePaths(stack, cleanupPatterns) {
             cleanUpIndexes.push([result.index, regexp.lastIndex]);
         }
     }
-    const nodeModulesRegex = /^[\\\/]?(node_modules|node_modules\.asar)[\\\/]/;
+    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;
+    const fileRegex = /(file:\/\/)?([a-zA-Z]:(\\\\|\\|\/)|(\\\\|\\|\/))?([\w\-\._@]+(\\\\|\\|\/))+[\w\-\._@]*/g;
     let lastIndex = 0;
     updatedStack = "";
     while (true) {
@@ -174,12 +174,17 @@ function anonymizeFilePaths(stack, cleanupPatterns) {
             break;
         }
         const overlappingRange = ( cleanUpIndexes.some(([start, end]) => result.index < end && start < fileRegex.lastIndex));
-        if (!nodeModulesRegex.test(result[0]) && !overlappingRange) {
+        if (!overlappingRange) {
             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>";
+                const nodeModulesMatch = nodeModulesRegex.exec(result[0]);
+                if (nodeModulesMatch) {
+                    updatedStack += stack.substring(lastIndex, result.index) + "<REDACTED: user-file-path>/" + nodeModulesMatch[1];
+                } else {
+                    updatedStack += stack.substring(lastIndex, result.index) + "<REDACTED: user-file-path>";
+                }
             }
             lastIndex = fileRegex.lastIndex;
         }

package/vscode/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.js

@@ -135,13 +135,23 @@ class TerminalCommand {
             return undefined;
         }
         let output = "";
+        let currentLine = "";
         let line;
+        const buffer = this._xterm.buffer.active;
         for (let i = startLine; i < endLine; i++) {
-            line = this._xterm.buffer.active.getLine(i);
+            line = buffer.getLine(i);
             if (!line) {
                 continue;
             }
-            output += line.translateToString(!line.isWrapped) + (line.isWrapped ? "" : "\n");
+            const isWrapped = i + 1 < endLine ? !!buffer.getLine(i + 1)?.isWrapped : false;
+            currentLine += line.translateToString(!isWrapped);
+            if (!isWrapped) {
+                output += currentLine + "\n";
+                currentLine = "";
+            }
+        }
+        if (currentLine.length > 0) {
+            output += currentLine;
         }
         return output === "" ? undefined : output;
     }