@codingame/monaco-vscode-api 2.2.1 → 3.0.0

package/vscode/src/vs/workbench/contrib/snippets/browser/tabCompletion.js

@@ -27,7 +27,7 @@ let TabCompletionController = class TabCompletionController {
         this._activeSnippets = [];
         this._hasSnippets = TabCompletionController_1.ContextKey.bindTo(contextKeyService);
         this._configListener = this._editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(122 )) {
+            if (e.hasChanged(123 )) {
                 this._update();
             }
         });
@@ -38,7 +38,7 @@ let TabCompletionController = class TabCompletionController {
         this._selectionListener?.dispose();
     }
     _update() {
-        const enabled = this._editor.getOption(122 ) === 'onlySnippets';
+        const enabled = this._editor.getOption(123 ) === 'onlySnippets';
         if (this._enabled !== enabled) {
             this._enabled = enabled;
             if (!this._enabled) {

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

@@ -1,11 +1,6 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { firstOrDefault } from '../../../../base/common/arrays.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
 const ISpeechService = ( createDecorator('speechService'));
 const HasSpeechProvider = ( new RawContextKey('hasSpeechProvider', false, { type: 'string', description: ( localizeWithPath(
     'vs/workbench/contrib/speech/common/speechService',
@@ -32,122 +27,6 @@ var KeywordRecognitionStatus;
 ( (function(KeywordRecognitionStatus) {
     KeywordRecognitionStatus[KeywordRecognitionStatus["Recognized"] = 1] = "Recognized";
     KeywordRecognitionStatus[KeywordRecognitionStatus["Stopped"] = 2] = "Stopped";
+    KeywordRecognitionStatus[KeywordRecognitionStatus["Canceled"] = 3] = "Canceled";
 })(KeywordRecognitionStatus || (KeywordRecognitionStatus = {})));
-let SpeechService = class SpeechService extends Disposable {
-    get hasSpeechProvider() { return this.providers.size > 0; }
-    constructor(logService, contextKeyService) {
-        super();
-        this.logService = logService;
-        this.contextKeyService = contextKeyService;
-        this._onDidRegisterSpeechProvider = this._register(( new Emitter()));
-        this.onDidRegisterSpeechProvider = this._onDidRegisterSpeechProvider.event;
-        this._onDidUnregisterSpeechProvider = this._register(( new Emitter()));
-        this.onDidUnregisterSpeechProvider = this._onDidUnregisterSpeechProvider.event;
-        this.providers = ( new Map());
-        this.hasSpeechProviderContext = HasSpeechProvider.bindTo(this.contextKeyService);
-        this._onDidStartSpeechToTextSession = this._register(( new Emitter()));
-        this.onDidStartSpeechToTextSession = this._onDidStartSpeechToTextSession.event;
-        this._onDidEndSpeechToTextSession = this._register(( new Emitter()));
-        this.onDidEndSpeechToTextSession = this._onDidEndSpeechToTextSession.event;
-        this._activeSpeechToTextSession = undefined;
-        this.speechToTextInProgress = SpeechToTextInProgress.bindTo(this.contextKeyService);
-        this._onDidStartKeywordRecognition = this._register(( new Emitter()));
-        this.onDidStartKeywordRecognition = this._onDidStartKeywordRecognition.event;
-        this._onDidEndKeywordRecognition = this._register(( new Emitter()));
-        this.onDidEndKeywordRecognition = this._onDidEndKeywordRecognition.event;
-        this._activeKeywordRecognitionSession = undefined;
-    }
-    registerSpeechProvider(identifier, provider) {
-        if (( this.providers.has(identifier))) {
-            throw new Error(`Speech provider with identifier ${identifier} is already registered.`);
-        }
-        this.providers.set(identifier, provider);
-        this.hasSpeechProviderContext.set(true);
-        this._onDidRegisterSpeechProvider.fire(provider);
-        return toDisposable(() => {
-            this.providers.delete(identifier);
-            this._onDidUnregisterSpeechProvider.fire(provider);
-            if (this.providers.size === 0) {
-                this.hasSpeechProviderContext.set(false);
-            }
-        });
-    }
-    get hasActiveSpeechToTextSession() { return !!this._activeSpeechToTextSession; }
-    createSpeechToTextSession(token) {
-        const provider = firstOrDefault(Array.from(( this.providers.values())));
-        if (!provider) {
-            throw new Error(`No Speech provider is registered.`);
-        }
-        else if (this.providers.size > 1) {
-            this.logService.warn(`Multiple speech providers registered. Picking first one: ${provider.metadata.displayName}`);
-        }
-        const session = this._activeSpeechToTextSession = provider.createSpeechToTextSession(token);
-        const disposables = ( new DisposableStore());
-        const onSessionStoppedOrCanceled = () => {
-            if (session === this._activeSpeechToTextSession) {
-                this._activeSpeechToTextSession = undefined;
-                this.speechToTextInProgress.reset();
-                this._onDidEndSpeechToTextSession.fire();
-            }
-            disposables.dispose();
-        };
-        disposables.add(token.onCancellationRequested(() => onSessionStoppedOrCanceled()));
-        if (token.isCancellationRequested) {
-            onSessionStoppedOrCanceled();
-        }
-        disposables.add(session.onDidChange(e => {
-            switch (e.status) {
-                case SpeechToTextStatus.Started:
-                    if (session === this._activeSpeechToTextSession) {
-                        this.speechToTextInProgress.set(true);
-                        this._onDidStartSpeechToTextSession.fire();
-                    }
-                    break;
-                case SpeechToTextStatus.Stopped:
-                    onSessionStoppedOrCanceled();
-                    break;
-            }
-        }));
-        return session;
-    }
-    get hasActiveKeywordRecognition() { return !!this._activeKeywordRecognitionSession; }
-    async recognizeKeyword(token) {
-        const provider = firstOrDefault(Array.from(( this.providers.values())));
-        if (!provider) {
-            throw new Error(`No Speech provider is registered.`);
-        }
-        else if (this.providers.size > 1) {
-            this.logService.warn(`Multiple speech providers registered. Picking first one: ${provider.metadata.displayName}`);
-        }
-        const session = this._activeKeywordRecognitionSession = provider.createKeywordRecognitionSession(token);
-        this._onDidStartKeywordRecognition.fire();
-        const disposables = ( new DisposableStore());
-        const onSessionStoppedOrCanceled = () => {
-            if (session === this._activeKeywordRecognitionSession) {
-                this._activeKeywordRecognitionSession = undefined;
-                this._onDidEndKeywordRecognition.fire();
-            }
-            disposables.dispose();
-        };
-        disposables.add(token.onCancellationRequested(() => onSessionStoppedOrCanceled()));
-        if (token.isCancellationRequested) {
-            onSessionStoppedOrCanceled();
-        }
-        disposables.add(session.onDidChange(e => {
-            if (e.status === KeywordRecognitionStatus.Stopped) {
-                onSessionStoppedOrCanceled();
-            }
-        }));
-        try {
-            return (await Event.toPromise(session.onDidChange)).status;
-        }
-        finally {
-            onSessionStoppedOrCanceled();
-        }
-    }
-};
-SpeechService = ( __decorate([
-    ( __param(0, ILogService)),
-    ( __param(1, IContextKeyService))
-], SpeechService));
-export { HasSpeechProvider, ISpeechService, KeywordRecognitionStatus, SpeechService, SpeechToTextInProgress, SpeechToTextStatus };
+export { HasSpeechProvider, ISpeechService, KeywordRecognitionStatus, SpeechToTextInProgress, SpeechToTextStatus };

package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js

@@ -76,7 +76,7 @@ var Configuration;
     }
     Configuration.from = from;
 })(Configuration || (Configuration = {})));
-const taskDefinitionsExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const taskDefinitionsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'taskDefinitions',
     activationEventsGenerator: (contributions, result) => {
         for (const task of contributions) {
@@ -94,7 +94,7 @@ const taskDefinitionsExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
         type: 'array',
         items: taskDefinitionSchema
     }
-}));
+});
 class TaskDefinitionRegistryImpl {
     constructor() {
         this._onDefinitionsChanged = ( new Emitter());

package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { isString } from '../../../../base/common/types.js';
 import { basename } from '../../../../base/common/resources.js';
 import { deepClone } from '../../../../base/common/objects.js';
@@ -10,7 +10,7 @@ const TASK_RUNNING_STATE = ( new RawContextKey('taskRunning', false, ( localizeW
     'tasks.taskRunningContext',
     "Whether a task is currently running."
 ))));
-const TASKS_CATEGORY = { value: ( localizeWithPath('vs/workbench/contrib/tasks/common/tasks', 'tasksCategory', "Tasks")), original: 'Tasks' };
+const TASKS_CATEGORY = ( localize2WithPath('vs/workbench/contrib/tasks/common/tasks', 'tasksCategory', "Tasks"));
 var ShellQuoting;
 ( (function(ShellQuoting) {
     ShellQuoting[ShellQuoting["Escape"] = 1] = "Escape";

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.js

@@ -5,7 +5,7 @@ import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, toDisposable, dispose } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { localizeWithPath } from '../../../../../nls.js';
-import { AudioCue, IAudioCueService } from '../../../../../platform/audioCues/browser/audioCueService.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
@@ -20,7 +20,7 @@ import { TerminalDecorationHoverManager, updateLayout } from './decorationStyles
 import { TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR } from '../../common/terminalColorRegistry.js';
 import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
 let DecorationAddon = class DecorationAddon extends Disposable {
-    constructor(_capabilities, _clipboardService, _contextMenuService, _configurationService, _themeService, _openerService, _quickInputService, lifecycleService, _commandService, instantiationService, _audioCueService, _notificationService) {
+    constructor(_capabilities, _clipboardService, _contextMenuService, _configurationService, _themeService, _openerService, _quickInputService, lifecycleService, _commandService, instantiationService, _accessibilitySignalService, _notificationService) {
         super();
         this._capabilities = _capabilities;
         this._clipboardService = _clipboardService;
@@ -30,7 +30,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         this._openerService = _openerService;
         this._quickInputService = _quickInputService;
         this._commandService = _commandService;
-        this._audioCueService = _audioCueService;
+        this._accessibilitySignalService = _accessibilitySignalService;
         this._notificationService = _notificationService;
         this._capabilityDisposables = ( new Map());
         this._decorations = ( new Map());
@@ -187,7 +187,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         commandDetectionListeners.push(capability.onCommandFinished(command => {
             this.registerCommandDecoration(command);
             if (command.exitCode) {
-                this._audioCueService.playAudioCue(AudioCue.terminalCommandFailed);
+                this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalCommandFailed);
             }
         }));
         commandDetectionListeners.push(capability.onCommandInvalidated(commands => {
@@ -531,7 +531,7 @@ DecorationAddon = ( __decorate([
     ( __param(7, ILifecycleService)),
     ( __param(8, ICommandService)),
     ( __param(9, IInstantiationService)),
-    ( __param(10, IAudioCueService)),
+    ( __param(10, IAccessibilitySignalService)),
     ( __param(11, INotificationService))
 ], DecorationAddon));
 export { DecorationAddon };

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { addDisposableListener, EventType } from '../../../../../base/browser/dom.js';
 import { Delayer } from '../../../../../base/common/async.js';
-import { fromNow } from '../../../../../base/common/date.js';
+import { fromNow, getDurationString } from '../../../../../base/common/date.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable, combinedDisposable } from '../../../../../base/common/lifecycle.js';
 import { localizeWithPath } from '../../../../../nls.js';
@@ -49,33 +49,70 @@ let TerminalDecorationHoverManager = class TerminalDecorationHoverManager extend
                         return;
                     }
                 }
-                else if (command.exitCode) {
-                    if (command.exitCode === -1) {
-                        hoverContent += ( localizeWithPath(
-                            'vs/workbench/contrib/terminal/browser/xterm/decorationStyles',
-                            'terminalPromptCommandFailed',
-                            'Command executed {0} and failed',
-                            fromNow(command.timestamp, true)
-                        ));
+                else {
+                    if (command.duration) {
+                        const durationText = getDurationString(command.duration);
+                        if (command.exitCode) {
+                            if (command.exitCode === -1) {
+                                hoverContent += ( localizeWithPath(
+                                    'vs/workbench/contrib/terminal/browser/xterm/decorationStyles',
+                                    'terminalPromptCommandFailed.duration',
+                                    'Command executed {0}, took {1} and failed',
+                                    fromNow(command.timestamp, true),
+                                    durationText
+                                ));
+                            }
+                            else {
+                                hoverContent += ( localizeWithPath(
+                                    'vs/workbench/contrib/terminal/browser/xterm/decorationStyles',
+                                    'terminalPromptCommandFailedWithExitCode.duration',
+                                    'Command executed {0}, took {1} and failed (Exit Code {2})',
+                                    fromNow(command.timestamp, true),
+                                    durationText,
+                                    command.exitCode
+                                ));
+                            }
+                        }
+                        else {
+                            hoverContent += ( localizeWithPath(
+                                'vs/workbench/contrib/terminal/browser/xterm/decorationStyles',
+                                'terminalPromptCommandSuccess.duration',
+                                'Command executed {0} and took {1}',
+                                fromNow(command.timestamp, true),
+                                durationText
+                            ));
+                        }
                     }
                     else {
-                        hoverContent += ( localizeWithPath(
-                            'vs/workbench/contrib/terminal/browser/xterm/decorationStyles',
-                            'terminalPromptCommandFailedWithExitCode',
-                            'Command executed {0} and failed (Exit Code {1})',
-                            fromNow(command.timestamp, true),
-                            command.exitCode
-                        ));
+                        if (command.exitCode) {
+                            if (command.exitCode === -1) {
+                                hoverContent += ( localizeWithPath(
+                                    'vs/workbench/contrib/terminal/browser/xterm/decorationStyles',
+                                    'terminalPromptCommandFailed',
+                                    'Command executed {0} and failed',
+                                    fromNow(command.timestamp, true)
+                                ));
+                            }
+                            else {
+                                hoverContent += ( localizeWithPath(
+                                    'vs/workbench/contrib/terminal/browser/xterm/decorationStyles',
+                                    'terminalPromptCommandFailedWithExitCode',
+                                    'Command executed {0} and failed (Exit Code {1})',
+                                    fromNow(command.timestamp, true),
+                                    command.exitCode
+                                ));
+                            }
+                        }
+                        else {
+                            hoverContent += ( localizeWithPath(
+                                'vs/workbench/contrib/terminal/browser/xterm/decorationStyles',
+                                'terminalPromptCommandSuccess',
+                                'Command executed {0}',
+                                fromNow(command.timestamp, true)
+                            ));
+                        }
                     }
                 }
-                else {
-                    hoverContent += ( localizeWithPath(
-                        'vs/workbench/contrib/terminal/browser/xterm/decorationStyles',
-                        'terminalPromptCommandSuccess',
-                        'Command executed {0}',
-                        fromNow(command.timestamp, true)
-                    ));
-                }
                 this._hoverService.showHover({ content: ( new MarkdownString(hoverContent)), target: element });
             });
         }), addDisposableListener(element, EventType.MOUSE_LEAVE, () => this.hideHover()), addDisposableListener(element, EventType.MOUSE_OUT, () => this.hideHover()));

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

@@ -22,7 +22,7 @@ import { ITelemetryService } from '../../../../../platform/telemetry/common/tele
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
 import { ILayoutService } from '../../../../../platform/layout/browser/layoutService.js';
-import { IAudioCueService } from '../../../../../platform/audioCues/browser/audioCueService.js';
+import { IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 
 /**
  * Wraps the xterm object with additional functionality. Interaction with the backing process is out
@@ -40,7 +40,7 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     private readonly _themeService;
     private readonly _telemetryService;
     private readonly _clipboardService;
-    private readonly _audioCueService;
+    private readonly _accessibilitySignalService;
     /** The raw xterm.js instance */
     readonly raw: Terminal;
     private _core;
@@ -98,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, _audioCueService: IAudioCueService, layoutService: ILayoutService);
+    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);
     getBufferReverseIterator(): IterableIterator<string>;
     getContentsAsHtml(): Promise<string>;
     getSelectionAsHtml(command?: ITerminalCommand): Promise<string>;

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

@@ -24,7 +24,7 @@ import { debounce } from '../../../../../base/common/decorators.js';
 import { MouseWheelClassifier } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
 import { StandardWheelEvent } from '../../../../../base/browser/mouseEvent.js';
 import { ILayoutService } from '../../../../../platform/layout/browser/layoutService.js';
-import { AudioCue, IAudioCueService } from '../../../../../platform/audioCues/browser/audioCueService.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 var XtermTerminal_1;
 let CanvasAddon;
 let ImageAddon;
@@ -69,7 +69,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         }
         return isAncestorOfActiveElement(this.raw.element);
     }
-    constructor(xtermCtor, _configHelper, cols, rows, _xtermColorProvider, _capabilities, shellIntegrationNonce, disableShellIntegrationReporting, _configurationService, _instantiationService, _logService, _notificationService, _storageService, _themeService, _telemetryService, _clipboardService, contextKeyService, _audioCueService, layoutService) {
+    constructor(xtermCtor, _configHelper, cols, rows, _xtermColorProvider, _capabilities, shellIntegrationNonce, disableShellIntegrationReporting, _configurationService, _instantiationService, _logService, _notificationService, _storageService, _themeService, _telemetryService, _clipboardService, contextKeyService, _accessibilitySignalService, layoutService) {
         super();
         this._configHelper = _configHelper;
         this._xtermColorProvider = _xtermColorProvider;
@@ -82,7 +82,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this._themeService = _themeService;
         this._telemetryService = _telemetryService;
         this._clipboardService = _clipboardService;
-        this._audioCueService = _audioCueService;
+        this._accessibilitySignalService = _accessibilitySignalService;
         this._isPhysicalMouseWheel = MouseWheelClassifier.INSTANCE.isPhysicalMouseWheel();
         this._attachedDisposables = this._register(( new DisposableStore()));
         this._onDidRequestRunCommand = this._register(( new Emitter()));
@@ -420,7 +420,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this.raw.clear();
         this._capabilities.get(2 )?.handlePromptStart();
         this._capabilities.get(2 )?.handleCommandStart();
-        this._audioCueService.playAudioCue(AudioCue.clear);
+        this._accessibilitySignalService.playSignal(AccessibilitySignal.clear);
     }
     hasSelection() {
         return this.raw.hasSelection();
@@ -767,7 +767,7 @@ XtermTerminal = XtermTerminal_1 = ( __decorate([
     ( __param(14, ITelemetryService)),
     ( __param(15, IClipboardService)),
     ( __param(16, IContextKeyService)),
-    ( __param(17, IAudioCueService)),
+    ( __param(17, IAccessibilitySignalService)),
     ( __param(18, ILayoutService))
 ], XtermTerminal));
 function getXtermScaledDimensions(w, font, width, height) {

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

@@ -1,5 +1,6 @@
 import { localizeWithPath } from '../../../../nls.js';
-import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { TERMINAL_VIEW_ID } from './terminal.js';
 var TerminalContextKeys;
 ( (function(TerminalContextKeys) {
     TerminalContextKeys.isOpen = ( new RawContextKey("terminalIsOpen" , false, true));
@@ -189,5 +190,27 @@ var TerminalContextKeys;
             "Whether shell integration is enabled in the active terminal"
         ))
     ));
+    TerminalContextKeys.shouldShowViewInlineActions = ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', TERMINAL_VIEW_ID)), ( ContextKeyExpr.notEquals(
+        `config.${"terminal.integrated.tabs.hideCondition" }`,
+        'never'
+    )), ( ContextKeyExpr.or(
+        ContextKeyExpr.not(`config.${"terminal.integrated.tabs.enabled" }`),
+        ( ContextKeyExpr.and(( ContextKeyExpr.equals(
+            `config.${"terminal.integrated.tabs.showActions" }`,
+            'singleTerminal'
+        )), ( ContextKeyExpr.equals("terminalGroupCount", 1)))),
+        ( ContextKeyExpr.and(( ContextKeyExpr.equals(
+            `config.${"terminal.integrated.tabs.showActions" }`,
+            'singleTerminalOrNarrow'
+        )), ( ContextKeyExpr.or(( ContextKeyExpr.equals("terminalGroupCount", 1)), ( ContextKeyExpr.has("isTerminalTabsNarrow" )))))),
+        ( ContextKeyExpr.and(( ContextKeyExpr.equals(
+            `config.${"terminal.integrated.tabs.showActions" }`,
+            'singleGroup'
+        )), ( ContextKeyExpr.equals("terminalGroupCount", 1)))),
+        ( ContextKeyExpr.equals(
+            `config.${"terminal.integrated.tabs.showActions" }`,
+            'always'
+        ))
+    ))));
 })(TerminalContextKeys || (TerminalContextKeys = {})));
 export { TerminalContextKeys };

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

@@ -2,7 +2,7 @@ import { ExtensionsRegistry } from '../../../services/extensions/common/extensio
 import { terminalContributionsDescriptor } from './terminal.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { URI } from '../../../../base/common/uri.js';
-const terminalsExtPoint = ( ExtensionsRegistry.registerExtensionPoint(terminalContributionsDescriptor));
+const terminalsExtPoint = ExtensionsRegistry.registerExtensionPoint(terminalContributionsDescriptor);
 const ITerminalContributionService = ( createDecorator('terminalContributionsService'));
 class TerminalContributionService {
     get terminalProfiles() { return this._terminalProfiles; }

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

@@ -57,8 +57,8 @@ class TestCoverage {
                     if (v.branch) {
                         ICoveredCount.sum(fileCoverage.branch ??= ICoveredCount.empty(), v.branch);
                     }
-                    if (v.function) {
-                        ICoveredCount.sum(fileCoverage.function ??= ICoveredCount.empty(), v.function);
+                    if (v.declaration) {
+                        ICoveredCount.sum(fileCoverage.declaration ??= ICoveredCount.empty(), v.declaration);
                     }
                 }
             }
@@ -94,13 +94,13 @@ const getTotalCoveragePercent = (statement, branch, function_) => {
 };
 class AbstractFileCoverage {
     get tpc() {
-        return getTotalCoveragePercent(this.statement, this.branch, this.function);
+        return getTotalCoveragePercent(this.statement, this.branch, this.declaration);
     }
     constructor(coverage) {
         this.uri = coverage.uri;
         this.statement = coverage.statement;
         this.branch = coverage.branch;
-        this.function = coverage.function;
+        this.declaration = coverage.declaration;
     }
 }
 class ComputedFileCoverage extends AbstractFileCoverage {

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

@@ -232,14 +232,14 @@ var IFileCoverage;
     IFileCoverage.serialize = (original) => ({
         statement: original.statement,
         branch: original.branch,
-        function: original.function,
+        declaration: original.declaration,
         details: original.details?.map(CoverageDetails.serialize),
         uri: original.uri.toJSON(),
     });
     IFileCoverage.deserialize = (uriIdentity, serialized) => ({
         statement: serialized.statement,
         branch: serialized.branch,
-        function: serialized.function,
+        declaration: serialized.declaration,
         details: serialized.details?.map(CoverageDetails.deserialize),
         uri: uriIdentity.asCanonicalUri(URI.revive(serialized.uri)),
     });
@@ -257,19 +257,19 @@ function deserializeThingWithLocation(serialized) {
 const KEEP_N_LAST_COVERAGE_REPORTS = 3;
 var CoverageDetails;
 ( (function(CoverageDetails) {
-    CoverageDetails.serialize = (original) => original.type === 0  ? IFunctionCoverage.serialize(original) : IStatementCoverage.serialize(original);
-    CoverageDetails.deserialize = (serialized) => serialized.type === 0  ? IFunctionCoverage.deserialize(serialized) : IStatementCoverage.deserialize(serialized);
+    CoverageDetails.serialize = (original) => original.type === 0  ? IDeclarationCoverage.serialize(original) : IStatementCoverage.serialize(original);
+    CoverageDetails.deserialize = (serialized) => serialized.type === 0  ? IDeclarationCoverage.deserialize(serialized) : IStatementCoverage.deserialize(serialized);
 })(CoverageDetails || (CoverageDetails = {})));
 var IBranchCoverage;
 ( (function(IBranchCoverage) {
     IBranchCoverage.serialize = serializeThingWithLocation;
     IBranchCoverage.deserialize = deserializeThingWithLocation;
 })(IBranchCoverage || (IBranchCoverage = {})));
-var IFunctionCoverage;
-( (function(IFunctionCoverage) {
-    IFunctionCoverage.serialize = serializeThingWithLocation;
-    IFunctionCoverage.deserialize = deserializeThingWithLocation;
-})(IFunctionCoverage || (IFunctionCoverage = {})));
+var IDeclarationCoverage;
+( (function(IDeclarationCoverage) {
+    IDeclarationCoverage.serialize = serializeThingWithLocation;
+    IDeclarationCoverage.deserialize = deserializeThingWithLocation;
+})(IDeclarationCoverage || (IDeclarationCoverage = {})));
 var IStatementCoverage;
 ( (function(IStatementCoverage) {
     IStatementCoverage.serialize = (original) => ({
@@ -426,4 +426,4 @@ class AbstractIncrementalTestCollection {
         return {};
     }
 }
-export { AbstractIncrementalTestCollection, CoverageDetails, IBranchCoverage, ICoveredCount, IFileCoverage, IFunctionCoverage, IRichLocation, IStatementCoverage, ITestErrorMessage, ITestItem, ITestItemUpdate, ITestMessage, ITestOutputMessage, ITestTaskState, InternalTestItem, KEEP_N_LAST_COVERAGE_REPORTS, TestResultItem, TestsDiffOp, applyTestItemUpdate, denamespaceTestTag, getMarkId, isStartControllerTests, namespaceTestTag, testRunProfileBitsetList };
+export { AbstractIncrementalTestCollection, CoverageDetails, IBranchCoverage, ICoveredCount, IDeclarationCoverage, IFileCoverage, IRichLocation, IStatementCoverage, ITestErrorMessage, ITestItem, ITestItemUpdate, ITestMessage, ITestOutputMessage, ITestTaskState, InternalTestItem, KEEP_N_LAST_COVERAGE_REPORTS, TestResultItem, TestsDiffOp, applyTestItemUpdate, denamespaceTestTag, getMarkId, isStartControllerTests, namespaceTestTag, testRunProfileBitsetList };