Skip to content

Fixes error: can't run recursive splices when renaming a terminal tab #136177

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.

Sign up for GitHub

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

Merged
Tyriar merged 1 commit into from
Nov 2, 2021
Merged

Fixes error: can't run recursive splices when renaming a terminal tab #136177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/terminal/browser/terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ export interface ITerminalService extends ITerminalInstanceHost {
requestStartExtensionTerminal(proxy: ITerminalProcessExtHostProxy, cols: number, rows: number): Promise<ITerminalLaunchError | undefined>;
isAttachedToTerminal(remoteTerm: IRemoteTerminalAttachTarget): boolean;
getEditableData(instance: ITerminalInstance): IEditableData | undefined;
setEditable(instance: ITerminalInstance, data: IEditableData | null): Promise<void>;
setEditable(instance: ITerminalInstance, data: IEditableData | null): void;
isEditable(instance: ITerminalInstance | undefined): boolean;
safeDisposeTerminal(instance: ITerminalInstance): Promise<void>;

getDefaultInstanceHost(): ITerminalInstanceHost;
Expand Down
5 changes: 3 additions & 2 deletions src/vs/workbench/contrib/terminal/browser/terminalActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,17 +880,18 @@ export function registerTerminalActions() {
return;
}

await terminalService.setEditable(instance, {
terminalService.setEditable(instance, {
validationMessage: value => validateTerminalName(value),
onFinish: async (value, success) => {
// Cancel editing first as instance.rename will trigger a rerender automatically
terminalService.setEditable(instance, null);
if (success) {
try {
await instance.rename(value);
} catch (e) {
notificationService.error(e);
}
}
await terminalService.setEditable(instance, null);
}
});
}
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/terminal/browser/terminalService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,18 +477,18 @@ export class TerminalService implements ITerminalService {
return this.activeInstance || this.createTerminal();
}

async setEditable(instance: ITerminalInstance, data?: IEditableData | null): Promise<void> {
setEditable(instance: ITerminalInstance, data?: IEditableData | null): void {
if (!data) {
this._editable = undefined;
} else {
this._editable = { instance: instance, data };
}
const pane = this._viewsService.getActiveViewWithId<TerminalViewPane>(TERMINAL_VIEW_ID);
const isEditing = this._isEditable(instance);
const isEditing = this.isEditable(instance);
pane?.terminalTabbedView?.setEditable(isEditing);
}

private _isEditable(instance: ITerminalInstance | undefined): boolean {
isEditable(instance: ITerminalInstance | undefined): boolean {
return !!this._editable && (this._editable.instance === instance || !instance);
}

Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ export class TerminalTabbedView extends Disposable {
if (!isEditing) {
this._tabList.domFocus();
}
return this._tabList.refresh();
this._tabList.refresh(false);
}

focusTabs(): void {
Expand Down
25 changes: 15 additions & 10 deletions src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,11 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
return this._configurationService.getValue<'singleClick' | 'doubleClick'>(TerminalSettingId.TabsFocusMode);
}

refresh(): void {
refresh(cancelEditing: boolean = true): void {
if (cancelEditing && this._terminalService.isEditable(undefined)) {
this.domFocus();
}

this.splice(0, this.length, this._terminalGroupService.instances.slice());
}

Expand Down Expand Up @@ -324,12 +328,12 @@ class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminal
template.actionBar.clear();
}

if (!template.elementDispoables) {
template.elementDispoables = new DisposableStore();
if (!template.elementDisposables) {
template.elementDisposables = new DisposableStore();
}

// Kill terminal on middle click
template.elementDispoables.add(DOM.addDisposableListener(template.element, DOM.EventType.AUXCLICK, e => {
template.elementDisposables.add(DOM.addDisposableListener(template.element, DOM.EventType.AUXCLICK, e => {
e.stopImmediatePropagation();
if (e.button === 1/*middle*/) {
this._terminalService.safeDisposeTerminal(instance);
Expand Down Expand Up @@ -364,14 +368,13 @@ class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminal
const editableData = this._terminalService.getEditableData(instance);
template.label.element.classList.toggle('editable-tab', !!editableData);
if (editableData) {
this._renderInputBox(template.label.element.querySelector('.monaco-icon-label-container')!, instance, editableData);
template.elementDisposables.add(this._renderInputBox(template.label.element.querySelector('.monaco-icon-label-container')!, instance, editableData));
template.actionBar.clear();
}
}

private _renderInputBox(container: HTMLElement, instance: ITerminalInstance, editableData: IEditableData): IDisposable {

const label = this._labels.create(container);
const value = instance.title || '';

const inputBox = new InputBox(container, this._contextViewService, {
Expand Down Expand Up @@ -439,7 +442,6 @@ class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminal
DOM.addDisposableListener(inputBox.inputElement, DOM.EventType.BLUR, () => {
done(inputBox.isInputValid(), true);
}),
label,
styler
];

Expand All @@ -449,11 +451,14 @@ class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminal
}

disposeElement(instance: ITerminalInstance, index: number, templateData: ITerminalTabEntryTemplate): void {
templateData.elementDispoables?.dispose();
templateData.elementDispoables = undefined;
templateData.elementDisposables?.dispose();
templateData.elementDisposables = undefined;
}

disposeTemplate(templateData: ITerminalTabEntryTemplate): void {
templateData.elementDisposables?.dispose();
templateData.elementDisposables = undefined;
templateData.label.dispose();
}

fillActionBar(instance: ITerminalInstance, template: ITerminalTabEntryTemplate): void {
Expand Down Expand Up @@ -496,7 +501,7 @@ interface ITerminalTabEntryTemplate {
context: {
hoverActions?: IHoverAction[];
};
elementDispoables?: DisposableStore;
elementDisposables?: DisposableStore;
}


Expand Down