mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-17 02:51:36 -05:00
fix editors being disposed multiple times (#5594)
This commit is contained in:
@@ -100,8 +100,7 @@ export class QueryEditor extends BaseEditor {
|
|||||||
|
|
||||||
parent.appendChild(splitviewContainer);
|
parent.appendChild(splitviewContainer);
|
||||||
|
|
||||||
this.splitview = new SplitView(splitviewContainer, { orientation: Orientation.VERTICAL });
|
this.splitview = this._register(new SplitView(splitviewContainer, { orientation: Orientation.VERTICAL }));
|
||||||
this._register(this.splitview);
|
|
||||||
this._register(this.splitview.onDidSashReset(() => this.splitview.distributeViewSizes()));
|
this._register(this.splitview.onDidSashReset(() => this.splitview.distributeViewSizes()));
|
||||||
|
|
||||||
this.textEditorContainer = DOM.$('.text-editor-container');
|
this.textEditorContainer = DOM.$('.text-editor-container');
|
||||||
@@ -345,13 +344,6 @@ export class QueryEditor extends BaseEditor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public dispose(): void {
|
|
||||||
this.textEditor.dispose();
|
|
||||||
this.resultsEditor.dispose();
|
|
||||||
this.splitview.dispose();
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
public close(): void {
|
public close(): void {
|
||||||
let queryInput: QueryInput = <QueryInput>this.input;
|
let queryInput: QueryInput = <QueryInput>this.input;
|
||||||
queryInput.sql.close();
|
queryInput.sql.close();
|
||||||
@@ -490,20 +482,4 @@ export class QueryEditor extends BaseEditor {
|
|||||||
public chart(dataId: { batchId: number, resultId: number }) {
|
public chart(dataId: { batchId: number, resultId: number }) {
|
||||||
this.resultsEditor.chart(dataId);
|
this.resultsEditor.chart(dataId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the text selection for the SQL editor based on the given ISelectionData.
|
|
||||||
*/
|
|
||||||
private _setSelection(selection: ISelectionData): void {
|
|
||||||
let rangeConversion: IRange = {
|
|
||||||
startLineNumber: selection.startLine + 1,
|
|
||||||
startColumn: selection.startColumn + 1,
|
|
||||||
endLineNumber: selection.endLine + 1,
|
|
||||||
endColumn: selection.endColumn + 1
|
|
||||||
};
|
|
||||||
let editor = this.textEditor.getControl();
|
|
||||||
editor.revealRange(rangeConversion);
|
|
||||||
editor.setSelection(rangeConversion);
|
|
||||||
editor.focus();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user