Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not deal with single tab in disposable #239865

Merged
merged 1 commit into from
Feb 7, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/vs/workbench/contrib/terminal/browser/terminalView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ import { MicrotaskDelay } from '../../../../base/common/symbols.js';
export class TerminalViewPane extends ViewPane {
private _parentDomElement: HTMLElement | undefined;
private _terminalTabbedView?: TerminalTabbedView;
private readonly _singleTabActionViewItem: MutableDisposable<SingleTerminalTabActionViewItem> = this._register(new MutableDisposable());
get terminalTabbedView(): TerminalTabbedView | undefined { return this._terminalTabbedView; }
private _isInitialized: boolean = false;
/**
Expand Down Expand Up @@ -280,12 +279,8 @@ export class TerminalViewPane extends ViewPane {
}
case TerminalCommandId.Focus: {
if (action instanceof MenuItemAction) {
if (this._singleTabActionViewItem.value) {
return this._singleTabActionViewItem.value;
}
const actions = getFlatContextMenuActions(this._singleTabMenu.getActions({ shouldForwardArgs: true }));
this._singleTabActionViewItem.value = this._instantiationService.createInstance(SingleTerminalTabActionViewItem, action, actions);
return this._singleTabActionViewItem.value;
return this._instantiationService.createInstance(SingleTerminalTabActionViewItem, action, actions);
}
break;
}
Expand Down
Loading