@codingame/monaco-vscode-api 2.0.3 → 2.1.0

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { compare, firstNonWhitespaceIndex, compareSubstring } from '../../../../base/common/strings.js';
+import { compare, compareSubstring } from '../../../../base/common/strings.js';
+import { Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { SnippetParser } from '../../../../editor/contrib/snippet/browser/snippetParser.js';
@@ -10,7 +11,6 @@ import { Snippet } from './snippetsFile.js';
 import { isPatternInWord } from '../../../../base/common/filters.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
-import { getWordAtText } from '../../../../editor/common/core/wordHelper.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 const markSnippetAsUsed = '_snippet.markAsUsed';
 CommandsRegistry.registerCommand(markSnippetAsUsed, (accessor, ...args) => {
@@ -56,63 +56,68 @@ let SnippetCompletionProvider = class SnippetCompletionProvider {
     }
     async provideCompletionItems(model, position, context) {
         const sw = ( new StopWatch());
+        const line = position.lineNumber;
+        const word = model.getWordAtPosition(position) ?? { startColumn: position.column, endColumn: position.column, word: '' };
+        const lineContentLow = model.getLineContent(position.lineNumber).toLowerCase();
+        const lineContentWithWordLow = lineContentLow.substring(0, word.startColumn + word.word.length - 1);
+        const anchors = this._computeSnippetPositions(model, line, word, lineContentWithWordLow);
+        const columnOffset = position.column - 1;
+        const triggerCharacterLow = context.triggerCharacter?.toLowerCase() ?? '';
         const languageId = this._getLanguageIdAtPosition(model, position);
         const languageConfig = this._languageConfigurationService.getLanguageConfiguration(languageId);
         const snippets = ( new Set(await this._snippets.getSnippets(languageId)));
-        const lineContentLow = model.getLineContent(position.lineNumber).toLowerCase();
-        const wordUntil = model.getWordUntilPosition(position).word.toLowerCase();
         const suggestions = [];
-        const columnOffset = position.column - 1;
-        const triggerCharacterLow = context.triggerCharacter?.toLowerCase() ?? '';
-        snippet: for (const snippet of snippets) {
+        for (const snippet of snippets) {
             if (context.triggerKind === 1  && !snippet.prefixLow.startsWith(triggerCharacterLow)) {
-                continue snippet;
-            }
-            const word = getWordAtText(1, languageConfig.getWordDefinition(), snippet.prefixLow, 0);
-            if (wordUntil && word && !isPatternInWord(wordUntil, 0, wordUntil.length, snippet.prefixLow, 0, snippet.prefixLow.length)) {
-                continue snippet;
+                continue;
             }
-            const minPos = firstNonWhitespaceIndex(snippet.prefixLow) === 0
-                ? Math.max(0, model.getLineFirstNonWhitespaceColumn(position.lineNumber) - 1)
-                : 0;
-            column: for (let pos = Math.max(minPos, columnOffset - snippet.prefixLow.length); pos < lineContentLow.length; pos++) {
-                if (!isPatternInWord(lineContentLow, pos, columnOffset, snippet.prefixLow, 0, snippet.prefixLow.length)) {
-                    continue column;
+            let candidate;
+            for (const anchor of anchors) {
+                if (anchor.prefixLow.match(/^\s/) && !snippet.prefixLow.match(/^\s/)) {
+                    continue;
                 }
-                const prefixRestLen = snippet.prefixLow.length - (columnOffset - pos);
-                const endsWithPrefixRest = compareSubstring(lineContentLow, snippet.prefixLow, columnOffset, columnOffset + prefixRestLen, columnOffset - pos);
-                const startPosition = position.with(undefined, pos + 1);
-                if (wordUntil && position.equals(startPosition)) {
-                    continue snippet;
+                if (isPatternInWord(anchor.prefixLow, 0, anchor.prefixLow.length, snippet.prefixLow, 0, snippet.prefixLow.length)) {
+                    candidate = anchor;
+                    break;
                 }
-                let endColumn = endsWithPrefixRest === 0 ? position.column + prefixRestLen : position.column;
-                if (columnOffset < lineContentLow.length) {
-                    const autoClosingPairs = languageConfig.getAutoClosingPairs();
-                    const standardAutoClosingPairConditionals = autoClosingPairs.autoClosingPairsCloseSingleChar.get(lineContentLow[columnOffset]);
-                    if (standardAutoClosingPairConditionals?.some(p =>
-                    p.open === lineContentLow[startPosition.column - 1] &&
-                        snippet.prefix.startsWith(p.open) &&
-                        snippet.prefix[snippet.prefix.length - 1] === p.close)) {
-                        endColumn++;
-                    }
+            }
+            if (!candidate) {
+                continue;
+            }
+            const pos = candidate.startColumn - 1;
+            const prefixRestLen = snippet.prefixLow.length - (columnOffset - pos);
+            const endsWithPrefixRest = compareSubstring(lineContentLow, snippet.prefixLow, columnOffset, columnOffset + prefixRestLen, columnOffset - pos);
+            const startPosition = position.with(undefined, pos + 1);
+            let endColumn = endsWithPrefixRest === 0 ? position.column + prefixRestLen : position.column;
+            if (columnOffset < lineContentLow.length) {
+                const autoClosingPairs = languageConfig.getAutoClosingPairs();
+                const standardAutoClosingPairConditionals = autoClosingPairs.autoClosingPairsCloseSingleChar.get(lineContentLow[columnOffset]);
+                if (standardAutoClosingPairConditionals?.some(p =>
+                p.open === lineContentLow[startPosition.column - 1] &&
+                    snippet.prefix.startsWith(p.open) &&
+                    snippet.prefix[snippet.prefix.length - 1] === p.close)) {
+                    endColumn++;
                 }
-                const replace = Range.fromPositions(startPosition, { lineNumber: position.lineNumber, column: endColumn });
-                const insert = replace.setEndPosition(position.lineNumber, position.column);
-                suggestions.push(( new SnippetCompletion(snippet, { replace, insert })));
-                snippets.delete(snippet);
-                break;
             }
+            const replace = Range.fromPositions({ lineNumber: line, column: candidate.startColumn }, { lineNumber: line, column: endColumn });
+            const insert = replace.setEndPosition(line, position.column);
+            suggestions.push(( new SnippetCompletion(snippet, { replace, insert })));
+            snippets.delete(snippet);
         }
-        if (!triggerCharacterLow) {
-            const endsInWhitespace = /\s/.test(lineContentLow[position.column - 2]);
-            if (endsInWhitespace || !lineContentLow ) {
-                for (const snippet of snippets) {
-                    const insert = Range.fromPositions(position);
-                    const replace = lineContentLow.indexOf(snippet.prefixLow, columnOffset) === columnOffset ? insert.setEndPosition(position.lineNumber, position.column + snippet.prefixLow.length) : insert;
-                    suggestions.push(( new SnippetCompletion(snippet, { replace, insert })));
-                }
+        if (!triggerCharacterLow && ((/\s/.test(lineContentLow[position.column - 2])  || !lineContentLow) )) {
+            for (const snippet of snippets) {
+                const insert = Range.fromPositions(position);
+                const replace = lineContentLow.indexOf(snippet.prefixLow, columnOffset) === columnOffset ? insert.setEndPosition(position.lineNumber, position.column + snippet.prefixLow.length) : insert;
+                suggestions.push(( new SnippetCompletion(snippet, { replace, insert })));
             }
         }
+        this._disambiguateSnippets(suggestions);
+        return {
+            suggestions,
+            duration: sw.elapsed()
+        };
+    }
+    _disambiguateSnippets(suggestions) {
         suggestions.sort(SnippetCompletion.compareByLabel);
         for (let i = 0; i < suggestions.length; i++) {
             const item = suggestions[i];
@@ -137,14 +142,37 @@ let SnippetCompletionProvider = class SnippetCompletionProvider {
                 i = to;
             }
         }
-        return {
-            suggestions,
-            duration: sw.elapsed()
-        };
     }
     resolveCompletionItem(item) {
         return (item instanceof SnippetCompletion) ? item.resolve() : item;
     }
+    _computeSnippetPositions(model, line, word, lineContentWithWordLow) {
+        const result = [];
+        for (let column = 1; column < word.startColumn; column++) {
+            const wordInfo = model.getWordAtPosition(( new Position(line, column)));
+            result.push({
+                startColumn: column,
+                prefixLow: lineContentWithWordLow.substring(column - 1),
+                isWord: Boolean(wordInfo)
+            });
+            if (wordInfo) {
+                column = wordInfo.endColumn;
+                result.push({
+                    startColumn: wordInfo.endColumn,
+                    prefixLow: lineContentWithWordLow.substring(wordInfo.endColumn - 1),
+                    isWord: false
+                });
+            }
+        }
+        if (word.word.length > 0 || result.length === 0) {
+            result.push({
+                startColumn: word.startColumn,
+                prefixLow: lineContentWithWordLow.substring(word.startColumn - 1),
+                isWord: true
+            });
+        }
+        return result;
+    }
     _getLanguageIdAtPosition(model, position) {
         model.tokenization.tokenizeIfCheap(position.lineNumber);
         let languageId = model.getLanguageIdAtPosition(position.lineNumber, position.column);

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

@@ -1,3 +1,17 @@
+import { localizeWithPath } from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 const ISpeechService = ( createDecorator('speechService'));
-export { ISpeechService };
+const HasSpeechProvider = ( new RawContextKey('hasSpeechProvider', false, { type: 'string', description: ( localizeWithPath(
+    'vs/workbench/contrib/speech/common/speechService',
+    'hasSpeechProvider',
+    "A speech provider is registered to the speech service."
+)) }));
+var SpeechToTextStatus;
+( (function(SpeechToTextStatus) {
+    SpeechToTextStatus[SpeechToTextStatus["Started"] = 1] = "Started";
+    SpeechToTextStatus[SpeechToTextStatus["Recognizing"] = 2] = "Recognizing";
+    SpeechToTextStatus[SpeechToTextStatus["Recognized"] = 3] = "Recognized";
+    SpeechToTextStatus[SpeechToTextStatus["Stopped"] = 4] = "Stopped";
+})(SpeechToTextStatus || (SpeechToTextStatus = {})));
+export { HasSpeechProvider, ISpeechService, SpeechToTextStatus };

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

@@ -3,7 +3,7 @@ import { IDimension } from '../../../../base/browser/dom.js';
 import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
 import { Color } from '../../../../base/common/color.js';
 import { Event, IDynamicListEventMultiplexer } from '../../../../base/common/event.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 import { OperatingSystem } from '../../../../base/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
 import { TerminalCapability, ITerminalCapabilityImplMap, IMarkProperties, ITerminalCommand, ITerminalCapabilityStore } from '../../../../platform/terminal/common/capabilities/capabilities.js';
@@ -11,15 +11,15 @@ import { IMergedEnvironmentVariableCollection } from '../../../../platform/termi
 import { IShellLaunchConfig, ITerminalProfile, TerminalLocation, ITerminalBackend, ITerminalLaunchError, IExtensionTerminalProfile, TerminalIcon, IReconnectionProperties, WaitOnExitValue, TerminalExitReason, TitleEventSource, TerminalShellType, ITerminalDimensions, ITerminalTabLayoutInfoById, IShellIntegration } from '../../../../platform/terminal/common/terminal.js';
 import { IColorTheme } from '../../../../platform/theme/common/themeService.js';
 import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
-import '../../../../editor/editor.api.js';
+import { GroupIdentifier } from '../../../common/editor.js';
 import { IEditableData } from '../../../common/views.js';
 import { ITerminalStatusList } from './terminalStatusList.js';
 import { XtermTerminal } from './xterm/xtermTerminal.js';
 import { IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, IRemoteTerminalAttachTarget, ITerminalConfiguration, ITerminalFont, ITerminalProcessInfo } from '../common/terminal.js';
-import { EditorGroupColumn } from '../../../services/editor/common/editorGroupColumn.js';
-import { ISimpleSelectedSuggestion } from '../../../services/suggest/browser/simpleSuggestWidget.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IMarker, ITheme, Terminal } from '../../../../../../../external/@xterm/xterm/typings/xterm.js';
 import { ScrollPosition } from './xterm/markNavigationAddon.js';
+import { SIDE_GROUP_TYPE, ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE } from '../../../services/editor/common/editorService.js';
 
 /**
  * A terminal contribution that gets created whenever a terminal is created. A contribution has
@@ -252,7 +252,8 @@ interface ITerminalService extends ITerminalInstanceHost {
         acceptsInput?: boolean;
     }): Promise<ITerminalInstance>;
     revealActiveTerminal(preserveFocus?: boolean): Promise<void>;
-    moveToEditor(source: ITerminalInstance): void;
+    moveToEditor(source: ITerminalInstance, group?: GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): void;
+    moveIntoNewEditor(source: ITerminalInstance): void;
     moveToTerminalView(source: ITerminalInstance | URI): Promise<void>;
     getPrimaryBackend(): ITerminalBackend | undefined;
     /**
@@ -321,7 +322,7 @@ interface ICreateTerminalOptions {
     location?: ITerminalLocationOptions;
 }
 interface TerminalEditorLocation {
-    viewColumn: EditorGroupColumn;
+    viewColumn: GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE;
     preserveFocus?: boolean;
 }
 /**
@@ -391,6 +392,11 @@ interface ITerminalInstance extends IBaseTerminalInstance {
     readonly usedShellIntegrationInjection: boolean;
     readonly injectedArgs: string[] | undefined;
     readonly extEnvironmentVariableCollection: IMergedEnvironmentVariableCollection | undefined;
+    /**
+     * The underlying disposable store, allowing objects who share the same lifecycle as the
+     * terminal instance but are created externally to be managed by the instance.
+     */
+    readonly store: DisposableStore;
     readonly statusList: ITerminalStatusList;
     /**
      * The process ID of the shell process, this is undefined when there is no process associated
@@ -454,8 +460,9 @@ interface ITerminalInstance extends IBaseTerminalInstance {
     onDidBlur: Event<ITerminalInstance>;
     onDidInputData: Event<ITerminalInstance>;
     onDidChangeSelection: Event<ITerminalInstance>;
-    onDidRunText: Event<void>;
+    onDidExecuteText: Event<void>;
     onDidChangeTarget: Event<TerminalLocation | undefined>;
+    onDidSendText: Event<string>;
     /**
      * An event that fires when a terminal is dropped on this instance via drag and drop.
      */
@@ -558,8 +565,9 @@ interface ITerminalInstance extends IBaseTerminalInstance {
     shellIntegrationNonce: string;
     /**
      * Registers and returns a marker
+     * @param the y offset from the cursor
      */
-    registerMarker(): IMarker | undefined;
+    registerMarker(offset?: number): IMarker | undefined;
     /**
      * Adds a marker to the buffer, mapping it to an ID if provided.
      */
@@ -610,6 +618,11 @@ interface ITerminalInstance extends IBaseTerminalInstance {
      * Focuses and pastes the contents of the selection clipboard into the terminal instance.
      */
     pasteSelection(): Promise<void>;
+    /**
+     * Override the copy on selection feature with a custom value.
+     * @param value Whether to enable copySelection.
+     */
+    overrideCopyOnSelection(value: boolean): IDisposable;
     /**
      * Send text to the terminal instance. The text is written to the stdin of the underlying pty
      * process (shell) of the terminal instance.
@@ -725,7 +738,7 @@ interface ITerminalInstance extends IBaseTerminalInstance {
     /**
      * Sets or triggers a quick pick to change the color of the associated terminal tab icon.
      */
-    changeColor(color?: string): Promise<string | undefined>;
+    changeColor(color?: string, skipQuickPick?: boolean): Promise<string | undefined>;
     /**
      * Triggers a quick pick that displays recent commands or cwds. Selecting one will
      * rerun it in the active terminal.
@@ -737,29 +750,9 @@ interface ITerminalInstance extends IBaseTerminalInstance {
      */
     freePortKillProcess(port: string, commandToRun: string): Promise<void>;
     /**
-     * Selects the previous suggestion if the suggest widget is visible.
-     */
-    selectPreviousSuggestion(): void;
-    /**
-     * Selects the previous page suggestion if the suggest widget is visible.
-     */
-    selectPreviousPageSuggestion(): void;
-    /**
-     * Selects the next suggestion if the suggest widget is visible.
+     * Update the parent context key service to use for this terminal instance.
      */
-    selectNextSuggestion(): void;
-    /**
-     * Selects the next page suggestion if the suggest widget is visible.
-     */
-    selectNextPageSuggestion(): void;
-    /**
-     * Accepts the current suggestion if the suggest widget is visible.
-     */
-    acceptSelectedSuggestion(): Promise<void>;
-    /**
-     * Hides the suggest widget.
-     */
-    hideSuggestWidget(): void;
+    setParentContextKeyService(parentContextKeyService: IContextKeyService): void;
 }
 interface IXtermAttachToElementOptions {
     /**
@@ -929,18 +922,5 @@ declare const enum LinuxDistro {
     Fedora = 2,
     Ubuntu = 3
 }
-interface ISuggestController {
-    selectPreviousSuggestion(): void;
-    selectPreviousPageSuggestion(): void;
-    selectNextSuggestion(): void;
-    selectNextPageSuggestion(): void;
-    acceptSelectedSuggestion(suggestion?: Pick<ISimpleSelectedSuggestion, 'item' | 'model'>): void;
-    hideSuggestWidget(): void;
-    /**
-     * Handle data written to the terminal outside of xterm.js which has no corresponding
-     * `Terminal.onData` event.
-     */
-    handleNonXtermData(data: string): void;
-}
 
-export { Direction, type IBaseTerminalInstance, type ICreateTerminalOptions, type IDetachedTerminalInstance, type IDetachedXTermOptions, type IDetachedXtermTerminal, type IInternalXtermTerminal, type IMarkTracker, type IRequestAddInstanceToGroupEvent, type ISearchOptions, type ISuggestController, type ITerminalConfigHelper, type ITerminalContribution, type ITerminalGroup, type ITerminalInstance, type ITerminalInstanceHost, ITerminalInstanceService, type ITerminalLocationOptions, ITerminalService, 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 ITerminalConfigHelper, type ITerminalContribution, type ITerminalGroup, type ITerminalInstance, type ITerminalInstanceHost, ITerminalInstanceService, type ITerminalLocationOptions, ITerminalService, type ITerminalServiceNativeDelegate, type IXtermAttachToElementOptions, type IXtermColorProvider, type IXtermTerminal, LinuxDistro, TerminalConnectionState, type TerminalEditorLocation };

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

@@ -22,6 +22,9 @@ let TerminalEditorInput = class TerminalEditorInput extends EditorInput {
     static { this.ID = 'workbench.editors.terminal'; }
     setGroup(group) {
         this._group = group;
+        if (group?.scopedContextKeyService) {
+            this._terminalInstance?.setParentContextKeyService(group.scopedContextKeyService);
+        }
     }
     get group() {
         return this._group;
@@ -103,6 +106,7 @@ let TerminalEditorInput = class TerminalEditorInput extends EditorInput {
         this._instantiationService = _instantiationService;
         this._configurationService = _configurationService;
         this._lifecycleService = _lifecycleService;
+        this._contextKeyService = _contextKeyService;
         this._dialogService = _dialogService;
         this.closeHandler = this;
         this._isDetached = false;
@@ -156,11 +160,17 @@ let TerminalEditorInput = class TerminalEditorInput extends EditorInput {
     getName() {
         return this._terminalInstance?.title || this.resource.fragment;
     }
+    getIcon() {
+        if (!this._terminalInstance || !ThemeIcon.isThemeIcon(this._terminalInstance.icon)) {
+            return undefined;
+        }
+        return this._terminalInstance.icon;
+    }
     getLabelExtraClasses() {
         if (!this._terminalInstance) {
             return [];
         }
-        const extraClasses = ['terminal-tab'];
+        const extraClasses = ['terminal-tab', 'predefined-file-icon'];
         const colorClass = getColorClass(this._terminalInstance);
         if (colorClass) {
             extraClasses.push(colorClass);
@@ -169,14 +179,12 @@ let TerminalEditorInput = class TerminalEditorInput extends EditorInput {
         if (uriClasses) {
             extraClasses.push(...uriClasses);
         }
-        if (ThemeIcon.isThemeIcon(this._terminalInstance.icon)) {
-            extraClasses.push(`codicon-${this._terminalInstance.icon.id}`);
-        }
         return extraClasses;
     }
     detachInstance() {
         if (!this._isShuttingDown) {
             this._terminalInstance?.detachFromElement();
+            this._terminalInstance?.setParentContextKeyService(this._contextKeyService);
             this._isDetached = true;
         }
     }

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

@@ -57,7 +57,8 @@ function getColorStyleContent(colorTheme, editor) {
         const color = colorTheme.getColor(colorKey);
         if (color) {
             if (editor) {
-                css += (`.monaco-workbench .show-file-icons .file-icon.terminal-tab.${colorClass}::before` +
+                css += (`.monaco-workbench .show-file-icons .predefined-file-icon.terminal-tab.${colorClass}::before,` +
+                    `.monaco-workbench .show-file-icons .file-icon.terminal-tab.${colorClass}::before` +
                     `{ color: ${color} !important; }`);
             }
             else {

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

@@ -266,7 +266,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         else if (command?.markProperties || markProperties) {
             return [this._terminalDecorationHoverService.createHover(element, command || markProperties, markProperties?.hoverMessage)];
         }
-        return [this._createContextMenu(element, command), this._terminalDecorationHoverService.createHover(element, command)];
+        return [...this._createContextMenu(element, command), this._terminalDecorationHoverService.createHover(element, command)];
     }
     _updateClasses(element, exitCode, markProperties) {
         if (!element) {
@@ -298,11 +298,38 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         }
     }
     _createContextMenu(element, command) {
-        return addDisposableListener(element, EventType.CLICK, async () => {
-            this._terminalDecorationHoverService.hideHover();
-            const actions = await this._getCommandActions(command);
-            this._contextMenuService.showContextMenu({ getAnchor: () => element, getActions: () => actions });
-        });
+        return [
+            addDisposableListener(element, EventType.MOUSE_DOWN, async (e) => {
+                e.stopImmediatePropagation();
+            }),
+            addDisposableListener(element, EventType.CLICK, async (e) => {
+                e.stopImmediatePropagation();
+                this._terminalDecorationHoverService.hideHover();
+                const actions = await this._getCommandActions(command);
+                this._contextMenuService.showContextMenu({ getAnchor: () => element, getActions: () => actions });
+            }),
+            addDisposableListener(element, EventType.CONTEXT_MENU, async (e) => {
+                e.stopImmediatePropagation();
+                this._terminalDecorationHoverService.hideHover();
+                const actions = this._getContextMenuActions();
+                this._contextMenuService.showContextMenu({ getAnchor: () => element, getActions: () => actions });
+            }),
+        ];
+    }
+    _getContextMenuActions() {
+        const label = ( localizeWithPath(
+            'vs/workbench/contrib/terminal/browser/xterm/decorationAddon',
+            'workbench.action.terminal.toggleVisibility',
+            "Toggle Visibility"
+        ));
+        return [
+            {
+                class: undefined, tooltip: label, id: 'terminal.toggleVisibility', label, enabled: true,
+                run: async () => {
+                    this._showToggleVisibilityQuickPick();
+                }
+            }
+        ];
     }
     async _getCommandActions(command) {
         const actions = [];
@@ -416,15 +443,6 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             run: () => this._commandService.executeCommand('workbench.action.terminal.goToRecentDirectory')
         });
         actions.push(( new Separator()));
-        const labelConfigure = ( localizeWithPath(
-            'vs/workbench/contrib/terminal/browser/xterm/decorationAddon',
-            "terminal.configureCommandDecorations",
-            'Configure Command Decorations'
-        ));
-        actions.push({
-            class: undefined, tooltip: labelConfigure, id: 'terminal.configureCommandDecorations', label: labelConfigure, enabled: true,
-            run: () => this._showConfigureCommandDecorationsQuickPick()
-        });
         const labelAbout = ( localizeWithPath(
             'vs/workbench/contrib/terminal/browser/xterm/decorationAddon',
             "terminal.learnShellIntegration",
@@ -436,27 +454,6 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         });
         return actions;
     }
-    async _showConfigureCommandDecorationsQuickPick() {
-        const quickPick = this._quickInputService.createQuickPick();
-        quickPick.items = [
-            { id: 'a', label: ( localizeWithPath(
-                'vs/workbench/contrib/terminal/browser/xterm/decorationAddon',
-                'toggleVisibility',
-                'Toggle visibility'
-            )) },
-        ];
-        quickPick.canSelectMany = false;
-        quickPick.onDidAccept(async (e) => {
-            quickPick.hide();
-            const result = quickPick.activeItems[0];
-            switch (result.id) {
-                case 'a':
-                    this._showToggleVisibilityQuickPick();
-                    break;
-            }
-        });
-        quickPick.show();
-    }
     _showToggleVisibilityQuickPick() {
         const quickPick = this._quickInputService.createQuickPick();
         quickPick.hideInput = true;

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

@@ -7,7 +7,7 @@ import { Disposable, combinedDisposable } from '../../../../../base/common/lifec
 import { localizeWithPath } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
-import { IHoverService } from '../../../../services/hover/browser/hover.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 let TerminalDecorationHoverManager = class TerminalDecorationHoverManager extends Disposable {
     constructor(_hoverService, configurationService, contextMenuService) {
         super();

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

@@ -237,6 +237,9 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             }
             const startLine = command.marker.line - (command.getPromptRowCount() - 1);
             const decorationCount = toLineIndex(command.endMarker) - startLine;
+            if (decorationCount > 200) {
+                return;
+            }
             for (let i = 0; i < decorationCount; i++) {
                 const decoration = this._terminal.registerDecoration({
                     marker: this._createMarkerForOffset(startLine, i)

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

@@ -11,7 +11,7 @@ import { TerminalConfigHelper } from '../terminalConfigHelper.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { IShellIntegration, ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
 import { ITerminalFont } from '../../common/terminal.js';
-import { IXtermTerminal, IDetachedXtermTerminal, IInternalXtermTerminal, IMarkTracker, ISuggestController, IXtermColorProvider, IXtermAttachToElementOptions } from '../terminal.js';
+import { IXtermTerminal, IDetachedXtermTerminal, IInternalXtermTerminal, IMarkTracker, IXtermColorProvider, IXtermAttachToElementOptions } from '../terminal.js';
 import { IStorageService } from '../../../../../platform/storage/common/storage.js';
 import { INotificationService } from '../../../../../platform/notification/common/notification.js';
 import { ScrollPosition } from './markNavigationAddon.js';
@@ -19,10 +19,10 @@ import { IThemeService, IColorTheme } from '../../../../../platform/theme/common
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ITerminalCommand, ITerminalCapabilityStore } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
-import { IAccessibleNotificationService } from '../../../../../platform/accessibility/common/accessibility.js';
 import { ILayoutService } from '../../../../../platform/layout/browser/layoutService.js';
+import { IAudioCueService } from '../../../../../platform/audioCues/browser/audioCueService.js';
 
 /**
  * Wraps the xterm object with additional functionality. Interaction with the backing process is out
@@ -32,7 +32,6 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     private readonly _configHelper;
     private readonly _xtermColorProvider;
     private readonly _capabilities;
-    private readonly _terminalSuggestWidgetVisibleContextKey;
     private readonly _configurationService;
     private readonly _instantiationService;
     private readonly _logService;
@@ -41,7 +40,7 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     private readonly _themeService;
     private readonly _telemetryService;
     private readonly _clipboardService;
-    private readonly _accessibleNotificationService;
+    private readonly _audioCueService;
     /** The raw xterm.js instance */
     readonly raw: Terminal;
     private _core;
@@ -52,7 +51,6 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     private _markNavigationAddon;
     private _shellIntegrationAddon;
     private _decorationAddon;
-    private _suggestAddon?;
     private _canvasAddon?;
     private _searchAddon?;
     private _unicode11Addon?;
@@ -94,14 +92,13 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     readonly onDidDispose: Event<void>;
     get markTracker(): IMarkTracker;
     get shellIntegration(): IShellIntegration;
-    get suggestController(): ISuggestController | undefined;
     get textureAtlas(): Promise<ImageBitmap> | undefined;
     get isFocused(): boolean;
     /**
      * @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, _terminalSuggestWidgetVisibleContextKey: IContextKey<boolean> | undefined, disableShellIntegrationReporting: boolean, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _logService: ITerminalLogService, _notificationService: INotificationService, _storageService: IStorageService, _themeService: IThemeService, _telemetryService: ITelemetryService, _clipboardService: IClipboardService, contextKeyService: IContextKeyService, _accessibleNotificationService: IAccessibleNotificationService, 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, _audioCueService: IAudioCueService, layoutService: ILayoutService);
     getBufferReverseIterator(): IterableIterator<string>;
     getContentsAsHtml(): Promise<string>;
     getSelectionAsHtml(command?: ITerminalCommand): Promise<string>;