ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-25 01:25:36 -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

12
src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts
View File

@@ -22,8 +22,8 @@ import {
SqlMainContext, MainThreadNotebookDocumentsAndEditorsShape, SqlExtHostContext, ExtHostNotebookDocumentsAndEditorsShape,
INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookShowOptions, INotebookModelAddedData, INotebookModelChangedData
} from 'sql/workbench/api/node/sqlExtHost.protocol';
import { NotebookInput, NotebookEditorModel } from 'sql/parts/notebook/notebookInput';
import { INotebookService, INotebookEditor, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService';
import { NotebookInput } from 'sql/parts/notebook/notebookInput';
import { INotebookService, INotebookEditor, IProviderInfo } from 'sql/workbench/services/notebook/common/notebookService';
import { TPromise } from 'vs/base/common/winjs.base';
import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
import { disposed } from 'vs/base/common/errors';
@@ -37,6 +37,7 @@ import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorIn
class MainThreadNotebookEditor extends Disposable {
private _contentChangedEmitter = new Emitter<NotebookContentChange>();
public readonly contentChanged: Event<NotebookContentChange> = this._contentChangedEmitter.event;
private _providerInfo: IProviderInfo;
constructor(public readonly editor: INotebookEditor) {
super();
@@ -49,6 +50,9 @@ class MainThreadNotebookEditor extends Disposable {
this._contentChangedEmitter.fire(changeEvent);
}));
});
editor.notebookParams.providerInfo.then(info => {
this._providerInfo = info;
});
}
public get uri(): URI {
@@ -64,11 +68,11 @@ class MainThreadNotebookEditor extends Disposable {
}
public get providerId(): string {
return this.editor.notebookParams.providerId;
return this._providerInfo ? this._providerInfo.providerId : undefined;
}
public get providers(): string[] {
return this.editor.notebookParams.providers;
return this._providerInfo ? this._providerInfo.providers : [];
}
public get cells(): ICellModel[] {

7
src/sql/workbench/services/notebook/common/notebookService.ts
View File

@@ -85,11 +85,14 @@ export interface INotebookManager {
readonly serverManager: azdata.nb.ServerManager;
}
export interface IProviderInfo {
providerId: string;
providers: string[];
}
export interface INotebookParams extends IBootstrapParams {
notebookUri: URI;
input: NotebookInput;
providerId: string;
providers: string[];
providerInfo: Promise<IProviderInfo>;
isTrusted: boolean;
profile?: IConnectionProfile;
modelFactory?: ModelFactory;