ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

#4363: Reopen notebook editors when ADS launched (#4424)

Browse Source 
* #4363: Reopen notebook editors when ADS launched

* Code review changes
This commit is contained in:
Raj
2019-03-12 23:02:37 -07:00
committed by GitHub
parent b495fb7a37
commit ebd187ec06
5 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/workbench/common/editor/editorGroup.ts
View File

@@ -16,6 +16,7 @@ import { ResourceMap } from 'vs/base/common/map';
import { QueryInput } from 'sql/parts/query/common/queryInput';
import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
import * as CustomInputConverter from 'sql/parts/common/customInputConverter';
import { NotebookInput } from 'sql/parts/notebook/notebookInput';
const EditorOpenPositioning = {
LEFT: 'left',
@@ -624,6 +625,8 @@ export class EditorGroup extends Disposable {
let editors = this.editors.map(e => {
if (e instanceof QueryInput) {
return e.sql;
} else if (e instanceof NotebookInput) {
return e.textInput;
}
return e;
});
@@ -654,6 +657,8 @@ export class EditorGroup extends Disposable {
let mru = this.mru.map(e => {
if (e instanceof QueryInput) {
return e.sql;
} else if (e instanceof NotebookInput) {
return e.textInput;
}
return e;
});

4
src/vs/workbench/services/editor/browser/editorService.ts
View File

@@ -528,10 +528,10 @@ export class EditorService extends Disposable implements EditorServiceImpl {
if (!untitledInput.resource || typeof untitledInput.filePath === 'string' || (untitledInput.resource instanceof URI && untitledInput.resource.scheme === Schemas.untitled)) {
// {{SQL CARBON EDIT}}
let mode: string = getFileMode( this.instantiationService, untitledInput.resource);
let modeId: string = untitledInput.language ? untitledInput.language : getFileMode( this.instantiationService, untitledInput.resource);
return convertEditorInput(this.untitledEditorService.createOrGet(
untitledInput.filePath ? URI.file(untitledInput.filePath) : untitledInput.resource,
mode,
modeId,
untitledInput.contents,
untitledInput.encoding
), undefined, this.instantiationService);