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

@@ -1117,7 +1117,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
}
public dispose(): void {
public override dispose(): void {
super.dispose();
this.disconnectAttachToConnections().catch(e => this.logService.error(e));
this.handleClosed().catch(e => this.logService.error(e));

View File

@@ -216,7 +216,7 @@ export class NotebookService extends Disposable implements INotebookService {
if (isUntitled) {
let untitledModel = await fileInput.resolve();
await untitledModel.load();
await untitledModel.resolve();
if (options.initialDirtyState === false) {
fileInput.setDirty(false);
}

View File

@@ -16,7 +16,7 @@ export class NotebookViewsExtension extends NotebookExtension<INotebookViewMetad
readonly maxNameIterationAttempts = 100;
readonly extension = 'azuredatastudio';
readonly version = 1;
override readonly version = 1;
protected _metadata: INotebookViewMetadata;
private _onViewDeleted = new Emitter<void>();