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

Merge from vscode 61d5f2b82f17bf9f99f56405204caab88a7e8747

Browse Source
This commit is contained in:
ADS Merger
2020-03-19 06:57:07 +00:00
parent 03ce5d1ba7
commit 84f67f61c4
137 changed files with 13234 additions and 796 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

@@ -40,7 +40,7 @@ import { BrowserFeatures } from 'vs/base/browser/canIUse';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
import { TerminalQuickAccessProvider } from 'vs/workbench/contrib/terminal/browser/terminaQuickAccess';
import { TerminalQuickAccessProvider } from 'vs/workbench/contrib/terminal/browser/terminalsQuickAccess';
registerSingleton(ITerminalService, TerminalService, true);
@@ -295,7 +295,7 @@ configurationRegistry.registerConfiguration({
default: true
},
'terminal.integrated.allowMnemonics': {
markdownDescription: nls.localize('terminal.integrated.allowMnemonics', "Whether to allow menubar mnemonics (eg. alt+f) to trigger the open the menubar. Note that this will cause all alt keystrokes will skip the shell when true."),
markdownDescription: nls.localize('terminal.integrated.allowMnemonics', "Whether to allow menubar mnemonics (eg. alt+f) to trigger the open the menubar. Note that this will cause all alt keystrokes will skip the shell when true. This does nothing on macOS."),
type: 'boolean',
default: false
},

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

@@ -621,7 +621,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
}
// Skip processing by xterm.js of keyboard events that match menu bar mnemonics
if (this._configHelper.config.allowMnemonics && event.altKey) {
if (this._configHelper.config.allowMnemonics && !platform.isMacintosh && event.altKey) {
return false;
}

10
src/vs/workbench/contrib/terminal/browser/terminaQuickAccess.ts → src/vs/workbench/contrib/terminal/browser/terminalsQuickAccess.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { localize } from 'vs/nls';
import { IQuickPickSeparator, IQuickPick } from 'vs/platform/quickinput/common/quickInput';
import { IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
import { matchesFuzzy } from 'vs/base/common/filters';
import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
@@ -19,13 +19,7 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
@ITerminalService private readonly terminalService: ITerminalService,
@ICommandService private readonly commandService: ICommandService,
) {
super(TerminalQuickAccessProvider.PREFIX);
}
protected configure(picker: IQuickPick<IPickerQuickAccessItem>): void {
// Allow to open terminals in background without closing picker
picker.canAcceptInBackground = true;
super(TerminalQuickAccessProvider.PREFIX, { canAcceptInBackground: true });
}
protected getPicks(filter: string): Array<IPickerQuickAccessItem | IQuickPickSeparator> {