ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-10 18:22:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 5d18ad4c5902e3bddbc9f78da82dfc2ac349e908 (#9683)

Browse Source
This commit is contained in:
Anthony Dresser
2020-03-20 01:17:27 -07:00
committed by GitHub
parent 1520441b84
commit dd8fb9433b
89 changed files with 3095 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
View File

@@ -37,19 +37,19 @@ export class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProv
return this.editorService.activeTextEditorControl;
}
protected gotoLocation(editor: IEditor, range: IRange, keyMods: IKeyMods, forceSideBySide?: boolean): void {
protected gotoLocation(editor: IEditor, options: { range: IRange, keyMods: IKeyMods, forceSideBySide?: boolean }): void {
// Check for sideBySide use
if ((keyMods.ctrlCmd || forceSideBySide) && this.editorService.activeEditor) {
if ((options.keyMods.ctrlCmd || options.forceSideBySide) && this.editorService.activeEditor) {
this.editorService.openEditor(this.editorService.activeEditor, {
selection: range,
pinned: keyMods.alt || this.configuration.openEditorPinned
selection: options.range,
pinned: options.keyMods.alt || this.configuration.openEditorPinned
}, SIDE_GROUP);
}
// Otherwise let parent handle it
else {
super.gotoLocation(editor, range, keyMods);
super.gotoLocation(editor, options);
}
}
}

10
src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
View File

@@ -40,19 +40,19 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
return this.editorService.activeTextEditorControl;
}
protected gotoLocation(editor: IEditor, range: IRange, keyMods: IKeyMods, forceSideBySide?: boolean): void {
protected gotoLocation(editor: IEditor, options: { range: IRange, keyMods: IKeyMods, forceSideBySide?: boolean }): void {
// Check for sideBySide use
if ((keyMods.ctrlCmd || forceSideBySide) && this.editorService.activeEditor) {
if ((options.keyMods.ctrlCmd || options.forceSideBySide) && this.editorService.activeEditor) {
this.editorService.openEditor(this.editorService.activeEditor, {
selection: range,
pinned: keyMods.alt || this.configuration.openEditorPinned
selection: options.range,
pinned: options.keyMods.alt || this.configuration.openEditorPinned
}, SIDE_GROUP);
}
// Otherwise let parent handle it
else {
super.gotoLocation(editor, range, keyMods);
super.gotoLocation(editor, options);
}
}
}