@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js

@@ -48,11 +48,32 @@ registerAction2(class RestrictSearchToFolderAction extends Action2 {
         await searchWithFolderCommand(accessor, false, true, undefined, folderMatch);
     }
 });
+registerAction2(class ExpandSelectedTreeCommandAction extends Action2 {
+    constructor() {
+        super({
+            id: "search.action.expandRecursively" ,
+            title: ( localizeWithPath(_moduleId, 1, "Expand Recursively")),
+            category,
+            menu: [{
+                    id: MenuId.SearchContext,
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.or(SearchContext.FileFocusKey, SearchContext.FolderFocusKey)),
+                        SearchContext.HasSearchResults
+                    ))),
+                    group: 'search',
+                    order: 4
+                }]
+        });
+    }
+    async run(accessor) {
+        await expandSelectSubtree(accessor);
+    }
+});
 registerAction2(class ExcludeFolderFromSearchAction extends Action2 {
     constructor() {
         super({
             id: "search.action.excludeFromSearch" ,
-            title: ( localize2WithPath(_moduleId, 1, "Exclude Folder from Search")),
+            title: ( localize2WithPath(_moduleId, 2, "Exclude Folder from Search")),
             category,
             menu: [
                 {
@@ -72,7 +93,7 @@ registerAction2(class RevealInSideBarForSearchResultsAction extends Action2 {
     constructor() {
         super({
             id: "search.action.revealInSideBar" ,
-            title: ( localize2WithPath(_moduleId, 2, "Reveal in Explorer View")),
+            title: ( localize2WithPath(_moduleId, 3, "Reveal in Explorer View")),
             category,
             menu: [{
                     id: MenuId.SearchContext,
@@ -119,14 +140,14 @@ registerAction2(class FindInFilesAction extends Action2 {
         super({
             id: "workbench.action.findInFiles" ,
             title: {
-                ...( localize2WithPath(_moduleId, 3, "Find in Files")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 4, "Find &&in Files")),
+                ...( localize2WithPath(_moduleId, 4, "Find in Files")),
+                mnemonicTitle: ( localizeWithPath(_moduleId, 5, "Find &&in Files")),
             },
             metadata: {
-                description: ( localizeWithPath(_moduleId, 5, "Open a workspace search")),
+                description: ( localizeWithPath(_moduleId, 6, "Open a workspace search")),
                 args: [
                     {
-                        name: ( localizeWithPath(_moduleId, 6, "A set of options for the search")),
+                        name: ( localizeWithPath(_moduleId, 7, "A set of options for the search")),
                         schema: {
                             type: 'object',
                             properties: {
@@ -167,7 +188,7 @@ registerAction2(class FindInFolderAction extends Action2 {
     constructor() {
         super({
             id: "filesExplorer.findInFolder" ,
-            title: ( localize2WithPath(_moduleId, 7, "Find in Folder...")),
+            title: ( localize2WithPath(_moduleId, 8, "Find in Folder...")),
             category,
             keybinding: {
                 weight: 200 ,
@@ -192,7 +213,7 @@ registerAction2(class FindInWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: "filesExplorer.findInWorkspace" ,
-            title: ( localize2WithPath(_moduleId, 8, "Find in Workspace...")),
+            title: ( localize2WithPath(_moduleId, 9, "Find in Workspace...")),
             category,
             menu: [
                 {
@@ -219,6 +240,15 @@ registerAction2(class FindInWorkspaceAction extends Action2 {
         }
     }
 });
+function expandSelectSubtree(accessor) {
+    const viewsService = accessor.get(IViewsService);
+    const searchView = getSearchView(viewsService);
+    if (searchView) {
+        const viewer = searchView.getControl();
+        const selected = viewer.getFocus()[0];
+        viewer.expand(selected, true);
+    }
+}
 async function searchWithFolderCommand(accessor, isFromExplorer, isIncludes, resource, folderMatch) {
     const listService = accessor.get(IListService);
     const fileService = accessor.get(IFileService);

package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js

@@ -317,7 +317,6 @@ let FileMatch = class FileMatch extends Disposable {
         this.searchInstanceID = searchInstanceID;
         this.modelService = modelService;
         this.replaceService = replaceService;
-        this.labelService = labelService;
         this.notebookEditorService = notebookEditorService;
         this._onChange = this._register(( new Emitter()));
         this.onChange = this._onChange.event;

package/vscode/src/vs/workbench/contrib/speech/common/speechService.js

@@ -14,6 +14,7 @@ var SpeechToTextStatus;
     SpeechToTextStatus[SpeechToTextStatus["Recognizing"] = 2] = "Recognizing";
     SpeechToTextStatus[SpeechToTextStatus["Recognized"] = 3] = "Recognized";
     SpeechToTextStatus[SpeechToTextStatus["Stopped"] = 4] = "Stopped";
+    SpeechToTextStatus[SpeechToTextStatus["Error"] = 5] = "Error";
 })(SpeechToTextStatus || (SpeechToTextStatus = {}))));
 var KeywordRecognitionStatus;
 ( ((function(KeywordRecognitionStatus) {

package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts

@@ -12,7 +12,7 @@ import { IColorTheme } from '../../../../platform/theme/common/themeService.js';
 import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
 import { ITerminalStatusList } from './terminalStatusList.js';
 import { XtermTerminal } from './xterm/xtermTerminal.js';
-import { ITerminalConfiguration, ITerminalFont, ITerminalProcessInfo } from '../common/terminal.js';
+import { ITerminalProcessInfo, ITerminalFont } from '../common/terminal.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IMarker, IBufferRange, ITheme, Terminal } from '@xterm/xterm';
 import { ScrollPosition } from './xterm/markNavigationAddon.js';
@@ -36,13 +36,6 @@ interface ITerminalContribution extends IDisposable {
         raw: Terminal;
     }): void;
 }
-interface ITerminalConfigHelper {
-    config: ITerminalConfiguration;
-    panelContainer: HTMLElement | undefined;
-    configFontIsMonospace(): boolean;
-    getFont(w: Window): ITerminalFont;
-    showRecommendations(shellLaunchConfig: IShellLaunchConfig): void;
-}
 declare const enum Direction {
     Left = 0,
     Right = 1,
@@ -189,6 +182,11 @@ interface ICreateTerminalOptions {
      * The terminal's location (editor or panel), it's terminal parent (split to the right), or editor group
      */
     location?: ITerminalLocationOptions;
+    /**
+     * This terminal will not wait for contributed profiles to resolve which means it will proceed
+     * when the workbench is not yet loaded.
+     */
+    skipContributedProfileCheck?: boolean;
 }
 interface TerminalEditorLocation {
     viewColumn: GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE;
@@ -786,10 +784,5 @@ interface IRequestAddInstanceToGroupEvent {
     uri: URI;
     side: 'before' | 'after';
 }
-declare const enum LinuxDistro {
-    Unknown = 1,
-    Fedora = 2,
-    Ubuntu = 3
-}
 
-export { Direction, type IBaseTerminalInstance, type ICreateTerminalOptions, type IDetachedTerminalInstance, type IDetachedXTermOptions, type IDetachedXtermTerminal, type IInternalXtermTerminal, type IMarkTracker, type IRequestAddInstanceToGroupEvent, type ISearchOptions, type ITerminalConfigHelper, type ITerminalContribution, type ITerminalGroup, type ITerminalInstance, type ITerminalInstanceHost, type ITerminalLocationOptions, type ITerminalServiceNativeDelegate, type IXtermAttachToElementOptions, type IXtermColorProvider, type IXtermTerminal, LinuxDistro, TerminalConnectionState, type TerminalEditorLocation };
+export { Direction, type IBaseTerminalInstance, type ICreateTerminalOptions, type IDetachedTerminalInstance, type IDetachedXTermOptions, type IDetachedXtermTerminal, type IInternalXtermTerminal, type IMarkTracker, type IRequestAddInstanceToGroupEvent, type ISearchOptions, type ITerminalContribution, type ITerminalGroup, type ITerminalInstance, type ITerminalInstanceHost, type ITerminalLocationOptions, type ITerminalServiceNativeDelegate, type IXtermAttachToElementOptions, type IXtermColorProvider, type IXtermTerminal, TerminalConnectionState, type TerminalEditorLocation };

package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.service.d.ts

@@ -1,13 +1,14 @@
 import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
-import { Event, IDynamicListEventMultiplexer } from '../../../../base/common/event.js';
+import { Event, DynamicListEventMultiplexer, IDynamicListEventMultiplexer } from '../../../../base/common/event.js';
 import { URI } from '../../../../base/common/uri.js';
 import { TerminalCapability, ITerminalCapabilityImplMap } from '../../../../platform/terminal/common/capabilities/capabilities.js';
 import { TerminalLocation, ITerminalBackend, ITerminalLaunchError, IShellLaunchConfig, ITerminalProfile } from '../../../../platform/terminal/common/terminal.js';
 import { IEditableData } from '../../../common/views.js';
-import { IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, IRemoteTerminalAttachTarget } from '../common/terminal.js';
+import { IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, IRemoteTerminalAttachTarget, ITerminalConfiguration, ITerminalFont } from '../common/terminal.js';
 import { GroupIdentifier } from '../../../common/editor.js';
 import { SIDE_GROUP_TYPE, ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE } from '../../../services/editor/common/editorService.js';
-import { ITerminalInstanceHost, ITerminalInstance, IDetachedTerminalInstance, ITerminalConfigHelper, TerminalConnectionState, ITerminalGroup, ICreateTerminalOptions, IDetachedXTermOptions, ITerminalLocationOptions, ITerminalServiceNativeDelegate } from './terminal.js';
+import { ITerminalInstanceHost, ITerminalInstance, IDetachedTerminalInstance, TerminalConnectionState, ITerminalGroup, ICreateTerminalOptions, IDetachedXTermOptions, ITerminalLocationOptions, ITerminalServiceNativeDelegate } from './terminal.js';
+import { IXtermCore } from './xterm-private.js';
 
 declare const ITerminalService: ServiceIdentifier<ITerminalService>;
 interface ITerminalService extends ITerminalInstanceHost {
@@ -16,7 +17,6 @@ interface ITerminalService extends ITerminalInstanceHost {
     readonly instances: readonly ITerminalInstance[];
     /** Gets detached terminal instances created via {@link createDetachedXterm}. */
     readonly detachedInstances: Iterable<IDetachedTerminalInstance>;
-    readonly configHelper: ITerminalConfigHelper;
     readonly defaultLocation: TerminalLocation;
     readonly isProcessSupportRegistered: boolean;
     readonly connectionState: TerminalConnectionState;
@@ -98,7 +98,7 @@ interface ITerminalService extends ITerminalInstanceHost {
     * instances and removing old instances as needed.
     * @param getEvent Maps the instance to the event.
     */
-    createOnInstanceEvent<T>(getEvent: (instance: ITerminalInstance) => Event<T>): Event<T>;
+    createOnInstanceEvent<T>(getEvent: (instance: ITerminalInstance) => Event<T>): DynamicListEventMultiplexer<ITerminalInstance, T>;
     /**
     * Creates a capability event listener that listens to capabilities on all instances,
     * dynamically adding and removing instances and capabilities as needed.
@@ -110,6 +110,24 @@ interface ITerminalService extends ITerminalInstanceHost {
         data: K;
     }>;
 }
+declare const ITerminalConfigurationService: ServiceIdentifier<ITerminalConfigurationService>;
+/**
+* A service that provides convenient access to the terminal configuration and derived values.
+*/
+interface ITerminalConfigurationService {
+    readonly _serviceBrand: undefined;
+    /**
+    * A typed and partially validated representation of the terminal configuration.
+    */
+    readonly config: Readonly<ITerminalConfiguration>;
+    /**
+    * Fires when something within the terminal configuration changes.
+    */
+    readonly onConfigChanged: Event<void>;
+    setPanelContainer(panelContainer: HTMLElement): void;
+    configFontIsMonospace(): boolean;
+    getFont(w: Window, xtermCore?: IXtermCore, excludeDimensions?: boolean): ITerminalFont;
+}
 declare const ITerminalInstanceService: ServiceIdentifier<ITerminalInstanceService>;
 /**
 * A service used to create instances or fetch backends, this services allows services that
@@ -146,4 +164,4 @@ interface ITerminalInstanceService {
     didRegisterBackend(remoteAuthority?: string): void;
 }
 
-export { ITerminalInstanceService, ITerminalService };
+export { ITerminalConfigurationService, ITerminalInstanceService, ITerminalService };

package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.service.js

@@ -1,6 +1,7 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 const ITerminalService = ( createDecorator('terminalService'));
+const ITerminalConfigurationService = ( createDecorator('terminalConfigurationService'));
 const ITerminalEditorService = ( createDecorator('terminalEditorService'));
 const ITerminalGroupService = ( createDecorator('terminalGroupService'));
 const ITerminalInstanceService = ( createDecorator('terminalInstanceService'));
-export { ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService };
+export { ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService };

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts

@@ -7,13 +7,12 @@ import { WebglAddon } from '@xterm/addon-webgl';
 import { SerializeAddon } from '@xterm/addon-serialize';
 import { ImageAddon } from '@xterm/addon-image';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
-import { TerminalConfigHelper } from '../terminalConfigHelper.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { IShellIntegration } from '../../../../../platform/terminal/common/terminal.js';
 import { ITerminalLogService } from '../../../../../platform/terminal/common/terminal.service.js';
 import { ITerminalFont } from '../../common/terminal.js';
 import { IXtermTerminal, IDetachedXtermTerminal, IInternalXtermTerminal, IMarkTracker, IXtermColorProvider, IXtermAttachToElementOptions } from '../terminal.js';
-import { IStorageService } from '../../../../../platform/storage/common/storage.service.js';
+import { ITerminalConfigurationService } from '../terminal.service.js';
 import { INotificationService } from '../../../../../platform/notification/common/notification.service.js';
 import { ScrollPosition } from './markNavigationAddon.js';
 import { IColorTheme } from '../../../../../platform/theme/common/themeService.js';
@@ -31,16 +30,15 @@ import { IAccessibilitySignalService } from '../../../../../platform/accessibili
  * of the scope of this class.
  */
 declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetachedXtermTerminal, IInternalXtermTerminal {
-    private readonly _configHelper;
     private readonly _xtermColorProvider;
     private readonly _capabilities;
     private readonly _configurationService;
     private readonly _instantiationService;
     private readonly _logService;
     private readonly _notificationService;
-    private readonly _storageService;
     private readonly _themeService;
     private readonly _telemetryService;
+    private readonly _terminalConfigurationService;
     private readonly _clipboardService;
     private readonly _accessibilitySignalService;
     /** The raw xterm.js instance */
@@ -72,8 +70,8 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     private readonly _onDidRequestRunCommand;
     readonly onDidRequestRunCommand: Event<{
         command: ITerminalCommand;
-        copyAsHtml?: boolean | undefined;
-        noNewLine?: boolean | undefined;
+        copyAsHtml?: boolean;
+        noNewLine?: boolean;
     }>;
     private readonly _onDidRequestFocus;
     readonly onDidRequestFocus: Event<void>;
@@ -100,7 +98,7 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
      * @param xtermCtor The xterm.js constructor, this is passed in so it can be fetched lazily
      * outside of this class such that {@link raw} is not nullable.
      */
-    constructor(xtermCtor: typeof Terminal, _configHelper: TerminalConfigHelper, cols: number, rows: number, _xtermColorProvider: IXtermColorProvider, _capabilities: ITerminalCapabilityStore, shellIntegrationNonce: string, disableShellIntegrationReporting: boolean, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _logService: ITerminalLogService, _notificationService: INotificationService, _storageService: IStorageService, _themeService: IThemeService, _telemetryService: ITelemetryService, _clipboardService: IClipboardService, contextKeyService: IContextKeyService, _accessibilitySignalService: IAccessibilitySignalService, layoutService: ILayoutService);
+    constructor(xtermCtor: typeof Terminal, cols: number, rows: number, _xtermColorProvider: IXtermColorProvider, _capabilities: ITerminalCapabilityStore, shellIntegrationNonce: string, disableShellIntegrationReporting: boolean, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _logService: ITerminalLogService, _notificationService: INotificationService, _themeService: IThemeService, _telemetryService: ITelemetryService, _terminalConfigurationService: ITerminalConfigurationService, _clipboardService: IClipboardService, contextKeyService: IContextKeyService, _accessibilitySignalService: IAccessibilitySignalService, layoutService: ILayoutService);
     getBufferReverseIterator(): IterableIterator<string>;
     getContentsAsHtml(): Promise<string>;
     getSelectionAsHtml(command?: ITerminalCommand): Promise<string>;
@@ -115,7 +113,6 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     forceRedraw(): void;
     clearDecorations(): void;
     forceRefresh(): void;
-    forceUnpause(): void;
     findNext(term: string, searchOptions: ISearchOptions): Promise<boolean>;
     findPrevious(term: string, searchOptions: ISearchOptions): Promise<boolean>;
     private _updateFindColors;
@@ -146,6 +143,9 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     private _setCursorWidth;
     private _enableWebglRenderer;
     private _disableWebglForThisSession;
+    /**
+     * @deprecated This will be removed in the future, see https://github.com/microsoft/vscode/issues/209276
+     */
     private _enableCanvasRenderer;
     protected _getCanvasAddonConstructor(): Promise<typeof CanvasAddon>;
     private _refreshImageAddon;
@@ -156,7 +156,6 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     protected _getSerializeAddonConstructor(): Promise<typeof SerializeAddon>;
     private _disposeOfCanvasRenderer;
     private _disposeOfWebglRenderer;
-    private _measureRenderTime;
     getXtermTheme(theme?: IColorTheme): ITheme;
     private _updateTheme;
     refresh(): void;

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts

@@ -14,17 +14,6 @@ interface IXtermCore {
 		readonly scrollBarWidth: number;
 		_innerRefresh(): void;
 	};
-	_onData: IEventEmitter<string>;
-	_onKey: IEventEmitter<{ key: string }>;
-
-	_charSizeService: {
-		width: number;
-		height: number;
-	};
-
-	coreService: {
-		triggerDataEvent(data: string, wasUserInput?: boolean): void;
-	};
 
 	_inputHandler: {
 		_curAttrData: XtermAttributes;
@@ -40,16 +29,9 @@ interface IXtermCore {
 			}
 		},
 		_renderer: {
-			value?: {
-				_renderLayers?: any[];
-			}
+			value?: unknown;
 		};
-		_handleIntersectionChange: any;
 	};
 }
 
-interface IEventEmitter<T> {
-	fire(e: T): void;
-}
-
-export type { IEventEmitter, IXtermCore, XtermAttributes };
+export type { IXtermCore, XtermAttributes };

package/vscode/src/vs/workbench/contrib/terminal/common/terminal.d.ts

@@ -6,7 +6,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ITerminalCapabilityStore } from '../../../../platform/terminal/common/capabilities/capabilities.js';
 import { IMergedEnvironmentVariableCollection } from '../../../../platform/terminal/common/environmentVariable.js';
-import { TitleEventSource, IFixedTerminalDimensions, IProcessProperty, IProcessReadyWindowsPty, ITerminalLaunchError, TerminalLocationString, ITerminalBackend, ITerminalProfileObject } from '../../../../platform/terminal/common/terminal.js';
+import { TitleEventSource, IFixedTerminalDimensions, IProcessProperty, IProcessReadyWindowsPty, ITerminalLaunchError, ITerminalBackend, TerminalLocationString, ITerminalProfileObject } from '../../../../platform/terminal/common/terminal.js';
 import { IEnvironmentVariableInfo } from './environmentVariable.js';
 
 type FontWeight = 'normal' | 'bold' | number;
@@ -51,6 +51,7 @@ interface ITerminalConfiguration {
     macOptionClickForcesSelection: boolean;
     gpuAcceleration: 'auto' | 'on' | 'canvas' | 'off';
     rightClickBehavior: 'default' | 'copyPaste' | 'paste' | 'selectWord' | 'nothing';
+    middleClickBehavior: 'default' | 'paste';
     cursorBlinking: boolean;
     cursorStyle: 'block' | 'underline' | 'line';
     cursorStyleInactive: 'outline' | 'block' | 'underline' | 'line' | 'none';
@@ -94,6 +95,7 @@ interface ITerminalConfiguration {
     windowsEnableConpty: boolean;
     wordSeparators: string;
     enableFileLinks: 'off' | 'on' | 'notRemote';
+    allowedLinkSchemes: string[];
     unicodeVersion: '6' | '11';
     localEchoLatencyThreshold: number;
     localEchoExcludePrograms: ReadonlyArray<string>;

package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js

@@ -188,10 +188,10 @@ const ansiColorMap = {
     'terminal.ansiGreen': {
         index: 2,
         defaults: {
-            light: '#00BC00',
+            light: '#107C10',
             dark: '#0DBC79',
             hcDark: '#00cd00',
-            hcLight: '#00bc00'
+            hcLight: '#136C13'
         }
     },
     'terminal.ansiYellow': {

package/vscode/src/vs/workbench/contrib/testing/common/testCoverage.js

@@ -1,6 +1,7 @@
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { deepClone } from '../../../../base/common/objects.js';
+import '../../../../base/common/arrays.js';
 import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import { observableSignal } from '../../../../base/common/observableInternal/utils.js';

package/vscode/src/vs/workbench/contrib/testing/common/testItemCollection.js

@@ -219,6 +219,7 @@ class TestItemCollection extends Disposable {
         const update = diffTestItems(this.options.toITestItem(oldActual), this.options.toITestItem(actual));
         this.options.getApiFor(oldActual).listener = undefined;
         internal.actual = actual;
+        internal.resolveBarrier = undefined;
         internal.expand = 0 ;
         if (update) {
             if (update.hasOwnProperty('tags')) {
@@ -233,6 +234,15 @@ class TestItemCollection extends Disposable {
                 this.removeItem(TestId.joinToString(fullId, child.id));
             }
         }
+        const expandLevels = internal.expandLevels;
+        if (expandLevels !== undefined) {
+            queueMicrotask(() => {
+                if (internal.expand === 1 ) {
+                    internal.expandLevels = undefined;
+                    this.expand(( fullId.toString()), expandLevels);
+                }
+            });
+        }
         this.documentSynced(internal.actual.uri);
     }
     diffTagRefs(newTags, oldTags, extId) {

package/vscode/src/vs/workbench/contrib/testing/common/testResult.js

@@ -1,3 +1,4 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { DeferredPromise } from '../../../../base/common/async.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
@@ -8,8 +9,10 @@ import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/arrays.js';
 import { language } from '../../../../base/common/platform.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { refreshComputedState } from './getComputedState.js';
 import { TestId } from './testId.js';
 import { makeEmptyCounts, terminalStatePriorities, maxPriority, statesInOrder } from './testingStates.js';
@@ -120,7 +123,7 @@ const itemToNode = (controllerId, item, parent) => ({
     ownComputedState: 0 ,
     computedState: 0 ,
 });
-class LiveTestResult extends Disposable {
+let LiveTestResult = class LiveTestResult extends Disposable {
     get completedAt() {
         return this._completedAt;
     }
@@ -129,11 +132,12 @@ class LiveTestResult extends Disposable {
              (this.testById.values())
         );
     }
-    constructor(id, persist, request) {
+    constructor(id, persist, request, telemetry) {
         super();
         this.id = id;
         this.persist = persist;
         this.request = request;
+        this.telemetry = telemetry;
         this.completeEmitter = this._register(( (new Emitter())));
         this.newTaskEmitter = this._register(( (new Emitter())));
         this.endTaskEmitter = this._register(( (new Emitter())));
@@ -274,6 +278,11 @@ class LiveTestResult extends Disposable {
         }
         this._completedAt = Date.now();
         this.completeEmitter.fire();
+        this.telemetry.publicLog2('test.outcomes', {
+            failures: this.counts[6 ] + this.counts[4 ],
+            passes: this.counts[3 ],
+            controller: ( (this.request.targets.map(t => t.controllerId))).join(',')
+        });
     }
     markRetired(testIds) {
         for (const [id, test] of this.testById) {
@@ -349,7 +358,10 @@ class LiveTestResult extends Disposable {
         }
         return index;
     }
-}
+};
+LiveTestResult = ( (__decorate([
+    ( (__param(3, ITelemetryService)))
+], LiveTestResult)));
 class HydratedTestResult {
     get tests() {
         return (

package/vscode/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.service.d.ts

@@ -0,0 +1,9 @@
+import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
+
+interface IAccessibleViewInformationService {
+    _serviceBrand: undefined;
+    hasShownAccessibleView(viewId: string): boolean;
+}
+declare const IAccessibleViewInformationService: ServiceIdentifier<IAccessibleViewInformationService>;
+
+export { IAccessibleViewInformationService };

package/vscode/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const IAccessibleViewInformationService = ( createDecorator('accessibleViewInformationService'));
+export { IAccessibleViewInformationService };

package/vscode/src/vs/workbench/services/editor/common/customEditorLabelService.js

@@ -2,10 +2,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Emitter } from '../../../../base/common/event.js';
 import { parse } from '../../../../base/common/glob.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { isAbsolute, parse as parse$1 } from '../../../../base/common/path.js';
-import { relativePath } from '../../../../base/common/resources.js';
+import { isAbsolute, parse as parse$1, dirname as dirname$1 } from '../../../../base/common/path.js';
+import { relativePath, dirname } from '../../../../base/common/resources.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
+import { MRUCache } from '../../../../base/common/map.js';
 import '../../../../platform/instantiation/common/instantiation.js';
 var CustomEditorLabelService_1;
 let CustomEditorLabelService = class CustomEditorLabelService extends Disposable {
@@ -20,8 +21,9 @@ let CustomEditorLabelService = class CustomEditorLabelService extends Disposable
         this.onDidChange = this._onDidChange.event;
         this.patterns = [];
         this.enabled = true;
+        this.cache = ( new MRUCache(1000));
         this._templateRegexValidation = /[a-zA-Z0-9]/;
-        this._parsedTemplateExpression = /\$\{(dirname|filename|extname|dirname\((\d+)\))\}/g;
+        this._parsedTemplateExpression = /\$\{(dirname|filename|extname|dirname\(([-+]?\d+)\))\}/g;
         this.storeEnablementState();
         this.storeCustomPatterns();
         this.registerListernes();
@@ -36,6 +38,7 @@ let CustomEditorLabelService = class CustomEditorLabelService extends Disposable
                 }
             }
             else if (e.affectsConfiguration(CustomEditorLabelService_1.SETTING_ID_PATTERNS)) {
+                this.cache.clear();
                 this.storeCustomPatterns();
                 this._onDidChange.fire();
             }
@@ -77,32 +80,39 @@ let CustomEditorLabelService = class CustomEditorLabelService extends Disposable
         return weight;
     }
     getName(resource) {
-        if (!this.enabled) {
+        if (!this.enabled || this.patterns.length === 0) {
             return undefined;
         }
-        return this.applyPatterns(resource);
+        const key = ( resource.toString());
+        const cached = this.cache.get(key);
+        if (cached !== undefined) {
+            return cached ?? undefined;
+        }
+        const result = this.applyPatterns(resource);
+        this.cache.set(key, result ?? null);
+        return result;
     }
     applyPatterns(resource) {
-        if (this.patterns.length === 0) {
-            return undefined;
-        }
         const root = this.workspaceContextService.getWorkspaceFolder(resource);
         let relativePath$1;
         for (const pattern of this.patterns) {
             let relevantPath;
             if (root && !pattern.isAbsolutePath) {
-                relevantPath = relativePath$1 = relativePath$1 ?? relativePath(root.uri, resource) ?? resource.path;
+                if (!relativePath$1) {
+                    relativePath$1 = relativePath(dirname(root.uri), resource) ?? resource.path;
+                }
+                relevantPath = relativePath$1;
             }
             else {
                 relevantPath = resource.path;
             }
             if (pattern.parsedPattern(relevantPath)) {
-                return this.applyTempate(pattern.template, resource);
+                return this.applyTempate(pattern.template, resource, relevantPath);
             }
         }
         return undefined;
     }
-    applyTempate(template, resource) {
+    applyTempate(template, resource, relevantPath) {
         let parsedPath;
         return template.replace(this._parsedTemplateExpression, (match, variable, arg) => {
             parsedPath = parsedPath ?? parse$1(resource.path);
@@ -113,7 +123,7 @@ let CustomEditorLabelService = class CustomEditorLabelService extends Disposable
                     return parsedPath.ext.slice(1);
                 default: {
                     const n = variable === 'dirname' ? 0 : parseInt(arg);
-                    const nthDir = this.getNthDirname(parsedPath, n);
+                    const nthDir = this.getNthDirname(dirname$1(relevantPath), n);
                     if (nthDir) {
                         return nthDir;
                     }
@@ -123,11 +133,15 @@ let CustomEditorLabelService = class CustomEditorLabelService extends Disposable
         });
     }
     getNthDirname(path, n) {
-        const pathFragments = path.dir.split('/');
+        path = path.startsWith('/') ? path.slice(1) : path;
+        const pathFragments = path.split('/');
         const length = pathFragments.length;
-        const nth = length - 1 - n;
-        if (nth < 0) {
-            return undefined;
+        let nth;
+        if (n < 0) {
+            nth = Math.abs(n) - 1;
+        }
+        else {
+            nth = length - n - 1;
         }
         const nthDir = pathFragments[nth];
         if (nthDir === undefined || nthDir === '') {