Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* 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

View File

@@ -156,7 +156,7 @@ export class RestoreDialog extends Modal {
this.viewModel.onUpdateRestoreDatabaseFiles((files) => this.updateRestoreDatabaseFiles(files));
}
public render() {
public override render() {
super.render();
attachModalDialogStyler(this, this._themeService);
let cancelLabel = localize('restoreDialog.cancel', "Cancel");
@@ -677,12 +677,12 @@ export class RestoreDialog extends Modal {
}
/* Overwrite esapce key behavior */
protected onClose() {
protected override onClose() {
this.cancel();
}
/* Overwrite enter key behavior */
protected onAccept() {
protected override onAccept() {
this.restore(false);
}
@@ -720,7 +720,7 @@ export class RestoreDialog extends Modal {
// Nothing currently laid out statically in this class
}
public dispose(): void {
public override dispose(): void {
super.dispose();
for (let key in this._optionsMap) {
let widget: Widget = this._optionsMap[key];