ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 17:22:48 -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/profiler/browser/profilerColumnEditorDialog.ts
View File

@@ -310,7 +310,7 @@ export class ProfilerColumnEditorDialog extends Modal {
super(nls.localize('profilerColumnDialog.profiler', "Profiler"), TelemetryKeys.ModalDialogName.Profiler, telemetryService, layoutService, clipboardService, themeService, logService, textResourcePropertiesService, contextKeyService);
}
public render(): void {
public override render(): void {
super.render();
this._register(attachModalDialogStyler(this, this._themeService));
this.addFooterButton(nls.localize('profilerColumnDialog.ok', "OK"), () => this.onAccept(undefined));
@@ -337,7 +337,7 @@ export class ProfilerColumnEditorDialog extends Modal {
this._updateList();
}
protected onAccept(e?: StandardKeyboardEvent): void {
protected override onAccept(e?: StandardKeyboardEvent): void {
this._updateInput();
super.onAccept(e);
}

8
src/sql/workbench/services/profiler/browser/profilerFilterDialog.ts
View File

@@ -93,11 +93,11 @@ export class ProfilerFilterDialog extends Modal {
this._okButton!.focus();
}
public dispose(): void {
public override dispose(): void {
}
public render() {
public override render() {
super.render();
this.title = DialogTitle;
this.titleIconClassName = TitleIconClass;
@@ -137,12 +137,12 @@ export class ProfilerFilterDialog extends Modal {
}
/* espace key */
protected onClose() {
protected override onClose() {
this.hide('close');
}
/* enter key */
protected onAccept() {
protected override onAccept() {
this.handleOkButtonClick();
}