ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 16:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 073a24de05773f2261f89172987002dc0ae2f1cd (#9711)

Browse Source
This commit is contained in:
Anthony Dresser
2020-03-24 00:24:15 -07:00
committed by GitHub
parent 29741d684e
commit 89ef1b0c2e
226 changed files with 6161 additions and 3288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
View File

@@ -381,7 +381,8 @@ const VIEW_CONTAINER = Registry.as<IViewContainersRegistry>(ViewContainerExtensi
id: TERMINAL_VIEW_ID,
name: nls.localize('terminal', "Terminal"),
ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [TERMINAL_VIEW_ID, TERMINAL_VIEW_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]),
focusCommand: { id: TERMINAL_COMMAND_ID.FOCUS }
focusCommand: { id: TERMINAL_COMMAND_ID.FOCUS },
hideIfEmpty: true
}, ViewContainerLocation.Panel);
Registry.as<panel.PanelRegistry>(panel.Extensions.Panels).setDefaultPanelId(TERMINAL_VIEW_ID);
@@ -389,6 +390,7 @@ Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews
id: TERMINAL_VIEW_ID,
name: nls.localize('terminal', "Terminal"),
canToggleVisibility: false,
canMoveView: true,
ctorDescriptor: new SyncDescriptor(TerminalViewPane)
}], VIEW_CONTAINER);

6
src/vs/workbench/contrib/terminal/browser/terminalActions.ts
View File

@@ -137,7 +137,7 @@ export class QuickKillTerminalAction extends Action {
instance.dispose(true);
}
await timeout(50);
return this.quickOpenService.show(TERMINAL_PICKER_PREFIX, undefined);
return this.quickOpenService.show(TERMINAL_PICKER_PREFIX);
}
}
@@ -1139,7 +1139,7 @@ export class QuickOpenTermAction extends Action {
}
public run(): Promise<void> {
return this.quickOpenService.show(TERMINAL_PICKER_PREFIX, undefined);
return this.quickOpenService.show(TERMINAL_PICKER_PREFIX);
}
}
@@ -1160,7 +1160,7 @@ export class RenameTerminalQuickOpenAction extends RenameTerminalAction {
await super.run(this.terminal);
// This timeout is needed to make sure the previous quickOpen has time to close before we show the next one
await timeout(50);
await this.quickOpenService.show(TERMINAL_PICKER_PREFIX, undefined);
await this.quickOpenService.show(TERMINAL_PICKER_PREFIX);
}
}

2
src/vs/workbench/contrib/terminal/browser/terminalsQuickAccess.ts
View File

@@ -55,7 +55,7 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
return TriggerAction.NO_ACTION;
case 1:
terminal.dispose(true);
return TriggerAction.REFRESH_PICKER;
return TriggerAction.REMOVE_ITEM;
}
return TriggerAction.NO_ACTION;