ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Issue when Saving Wrong Kernel (#7974)

Browse Source 
* Only fire kernelChangeEmitter after lang set

* Fix unused import found by lgtm

* Fix comment
This commit is contained in:
Chris LaFreniere
2019-10-24 22:13:18 -07:00
committed by GitHub
parent d013b594b1
commit f7059a2365
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql/workbench/parts/notebook/browser/models/notebookModel.ts
View File

@@ -7,7 +7,7 @@ import { nb, connection } from 'azdata';
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { Event, Emitter } from 'vs/base/common/event'; import { Event, Emitter } from 'vs/base/common/event';
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; import { Disposable } from 'vs/base/common/lifecycle';
import { IClientSession, INotebookModel, IDefaultConnection, INotebookModelOptions, ICellModel, NotebookContentChange, notebookConstants, INotebookContentsEditable } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { IClientSession, INotebookModel, IDefaultConnection, INotebookModelOptions, ICellModel, NotebookContentChange, notebookConstants, INotebookContentsEditable } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces';
import { NotebookChangeType, CellType, CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; import { NotebookChangeType, CellType, CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts';
@@ -75,7 +75,6 @@ export class NotebookModel extends Disposable implements INotebookModel {
private _kernelDisplayNameToNotebookProviderIds: Map<string, string> = new Map<string, string>(); private _kernelDisplayNameToNotebookProviderIds: Map<string, string> = new Map<string, string>();
private _onValidConnectionSelected = new Emitter<boolean>(); private _onValidConnectionSelected = new Emitter<boolean>();
private _oldKernel: nb.IKernel; private _oldKernel: nb.IKernel;
private _clientSessionListeners = new DisposableStore(); // should this be registered?
private _connectionUrisToDispose: string[] = []; private _connectionUrisToDispose: string[] = [];
private _textCellsLoading: number = 0; private _textCellsLoading: number = 0;
private _standardKernels: notebookUtils.IStandardKernelWithProvider[]; private _standardKernels: notebookUtils.IStandardKernelWithProvider[];
@@ -490,16 +489,9 @@ export class NotebookModel extends Disposable implements INotebookModel {
} }
} }
// When changing kernel, update the active session and register the kernel change event // When changing kernel, update the active session
// So KernelDropDown could get the event fired when added listerner on Model.KernelChange
private updateActiveClientSession(clientSession: IClientSession) { private updateActiveClientSession(clientSession: IClientSession) {
this.clearClientSessionListeners();
this._activeClientSession = clientSession; this._activeClientSession = clientSession;
this._clientSessionListeners.add(this._activeClientSession.kernelChanged(e => this._kernelChangedEmitter.fire(e)));
}
private clearClientSessionListeners() {
this._clientSessionListeners.clear();
} }
public setDefaultKernelAndProviderId() { public setDefaultKernelAndProviderId() {
@@ -670,6 +662,10 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (kernel.info) { if (kernel.info) {
this.updateLanguageInfo(kernel.info.language_info); this.updateLanguageInfo(kernel.info.language_info);
} }
this._kernelChangedEmitter.fire({
newValue: kernel,
oldValue: undefined
});
} }
private findSpec(displayName: string) { private findSpec(displayName: string) {
@@ -832,7 +828,6 @@ export class NotebookModel extends Disposable implements INotebookModel {
this.notifyError(localize('shutdownClientSessionError', "A client session error occurred when closing the notebook: {0}", getErrorMessage(err))); this.notifyError(localize('shutdownClientSessionError', "A client session error occurred when closing the notebook: {0}", getErrorMessage(err)));
} }
await this._activeClientSession.shutdown(); await this._activeClientSession.shutdown();
this.clearClientSessionListeners();
this._activeClientSession = undefined; this._activeClientSession = undefined;
} }
} }