ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 01:25:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/services/fileBrowser/browser/fileBrowserController.ts
View File

@@ -17,7 +17,7 @@ export class FileBrowserController extends treedefaults.DefaultController {
super({ clickBehavior: treedefaults.ClickBehavior.ON_MOUSE_DOWN, openMode: treedefaults.OpenMode.SINGLE_CLICK });
}
protected onLeftClick(tree: ITree, element: any, event: IMouseEvent, origin: string = 'mouse'): boolean {
protected override onLeftClick(tree: ITree, element: any, event: IMouseEvent, origin: string = 'mouse'): boolean {
// In file browser, double clicking an element calls tree.dispose(). There should not be any tree events after selection.
if (event.detail === 2) {
let payload = { origin: origin, originalEvent: event };
@@ -39,7 +39,7 @@ export class FileBrowserController extends treedefaults.DefaultController {
}
}
protected onEnter(tree: ITree, event: IKeyboardEvent): boolean {
protected override onEnter(tree: ITree, event: IKeyboardEvent): boolean {
let payload = { origin: 'keyboard', originalEvent: event };
if (tree.getHighlight()) {

4
src/sql/workbench/services/fileBrowser/browser/fileBrowserDialog.ts
View File

@@ -72,7 +72,7 @@ export class FileBrowserDialog extends Modal {
this._body = DOM.append(container, DOM.$('.file-browser-dialog'));
}
public render() {
public override render() {
super.render();
attachModalDialogStyler(this, this._themeService);
@@ -131,7 +131,7 @@ export class FileBrowserDialog extends Modal {
}
/* enter key */
protected onAccept() {
protected override onAccept() {
if (this._okButton.enabled === true) {
this.ok();
}