ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-12 11:08:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4452 Notebook is reloaded with wrong kernel (#4480)

Browse Source 
* Fix #4452 Notebook is reloaded with wrong kernel
- Await all extension registration before getting providers and providerId
To do this, we need to await way up in the NotebookInput, and promise the model that we'll have values eventually
This commit is contained in:
Kevin Cunnane
2019-03-13 20:03:01 -07:00
committed by GitHub
parent 5774b1f69a
commit 0131746919
5 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/sql/parts/notebook/notebookInput.ts
View File

@@ -15,7 +15,7 @@ import * as resources from 'vs/base/common/resources';
import * as azdata from 'azdata';
import { IStandardKernelWithProvider, getProvidersForFileName, getStandardKernelsForProvider } from 'sql/parts/notebook/notebookUtils';
import { INotebookService, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService';
import { INotebookService, DEFAULT_NOTEBOOK_PROVIDER, IProviderInfo } from 'sql/workbench/services/notebook/common/notebookService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ITextModelService } from 'vs/editor/common/services/resolverService';
import { INotebookModel, IContentManager } from 'sql/parts/notebook/models/modelInterfaces';
@@ -29,6 +29,7 @@ import { ITextFileService, ISaveOptions } from 'vs/workbench/services/textfile/c
import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager';
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
export type ModeViewSaveHandler = (handle: number) => Thenable<boolean>;
@@ -140,6 +141,7 @@ export class NotebookInput extends EditorInput {
private _model: NotebookEditorModel;
private _untitledEditorService: IUntitledEditorService;
private _contentManager: IContentManager;
private _providersLoaded: Promise<void>;
constructor(private _title: string,
private resource: URI,
@@ -147,13 +149,14 @@ export class NotebookInput extends EditorInput {
@ITextModelService private textModelService: ITextModelService,
@IUntitledEditorService untitledEditorService: IUntitledEditorService,
@IInstantiationService private instantiationService: IInstantiationService,
@INotebookService private notebookService: INotebookService
@INotebookService private notebookService: INotebookService,
@IExtensionService private extensionService: IExtensionService
) {
super();
this._untitledEditorService = untitledEditorService;
this.resource = resource;
this._standardKernels = [];
this.assignProviders();
this._providersLoaded = this.assignProviders();
}
public get textInput(): UntitledEditorInput {
@@ -186,14 +189,13 @@ export class NotebookInput extends EditorInput {
return this._title;
}
public get providerId(): string {
return this._providerId;
public async getProviderInfo(): Promise<IProviderInfo> {
await this._providersLoaded;
return {
providerId: this._providerId ? this._providerId : DEFAULT_NOTEBOOK_PROVIDER,
providers: this._providers ? this._providers : [DEFAULT_NOTEBOOK_PROVIDER]
};
}
public set providerId(value: string) {
this._providerId = value;
}
public get isTrusted(): boolean {
return this._isTrusted;
}
@@ -214,14 +216,6 @@ export class NotebookInput extends EditorInput {
return this._standardKernels;
}
public get providers(): string[] {
return this._providers;
}
public set providers(value: string[]) {
this._providers = value;
}
public save(): TPromise<boolean> {
let options: ISaveOptions = { force: false };
return this._model.save(options);
@@ -280,7 +274,8 @@ export class NotebookInput extends EditorInput {
}
}
private assignProviders(): void {
private async assignProviders(): Promise<void> {
await this.extensionService.whenInstalledExtensionsRegistered();
let providerIds: string[] = getProvidersForFileName(this._title, this.notebookService);
if (providerIds && providerIds.length > 0) {
this._providerId = providerIds.filter(provider => provider !== DEFAULT_NOTEBOOK_PROVIDER)[0];