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

Fix #3734 Notebook cells are shown empty some times even when there is content (#3878)

Browse Source 
- Editor layout gets called sometimes when other events happen (and Notebook isn't visible)
- Add in a layout call on re-setting input so the cell is updated. This fixes the problem by laying out once the UI is visible again.

Note: long term, should really be destroying the UI (while preserving the model), then restoring it including scroll selection etc. and hooking back up to the model. That is... much more work, but something we'll need long term to avoid issues where we have many Notebooks open at once. Not in scope for this PR
This commit is contained in:
Kevin Cunnane
2019-02-01 10:11:45 -08:00
committed by GitHub
parent 9504ede1f3
commit 5132e62045
8 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/sql/parts/notebook/models/notebookModel.ts
View File

@@ -44,6 +44,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
private _contextsChangedEmitter = new Emitter<void>();
private _contentChangedEmitter = new Emitter<NotebookContentChange>();
private _kernelsChangedEmitter = new Emitter<nb.IKernelSpec>();
private _layoutChanged = new Emitter<void>();
private _inErrorState: boolean = false;
private _clientSessions: IClientSession[] = [];
private _activeClientSession: IClientSession;
@@ -55,7 +56,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
private _cells: ICellModel[];
private _defaultLanguageInfo: nb.ILanguageInfo;
private onErrorEmitter = new Emitter<INotification>();
private _onErrorEmitter = new Emitter<INotification>();
private _savedKernelInfo: nb.IKernelInfo;
private readonly _nbformat: number = nbversion.MAJOR_VERSION;
private readonly _nbformatMinor: number = nbversion.MINOR_VERSION;
@@ -81,6 +82,9 @@ export class NotebookModel extends Disposable implements INotebookModel {
this._kernelDisplayNameToConnectionProviderIds.set(kernel.name, kernel.connectionProviderIds);
this._kernelDisplayNameToNotebookProviderIds.set(kernel.name, kernel.notebookProvider);
});
if (this.notebookOptions.layoutChanged) {
this.notebookOptions.layoutChanged(() => this._layoutChanged.fire());
}
this._defaultKernel = notebookOptions.defaultKernel;
}
@@ -139,6 +143,10 @@ export class NotebookModel extends Disposable implements INotebookModel {
return this._kernelsChangedEmitter.event;
}
public get layoutChanged(): Event<void> {
return this._layoutChanged.event;
}
public get defaultKernel(): nb.IKernelSpec {
return this._defaultKernel;
}
@@ -178,7 +186,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
}
public get onError(): Event<INotification> {
return this.onErrorEmitter.event;
return this._onErrorEmitter.event;
}
public get trustedMode(): boolean {
@@ -348,7 +356,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
}
private notifyError(error: string): void {
this.onErrorEmitter.fire({ message: error, severity: Severity.Error });
this._onErrorEmitter.fire({ message: error, severity: Severity.Error });
}
public backgroundStartSession(): void {