Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 06:21:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

debt - improve usage of untitled editor service

Browse Source
This commit is contained in:
Benjamin Pasero
2017-06-07 10:03:34 +02:00
parent 6f0d0c6bcc
commit ea1b253767
10 changed files with 196 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/api/electron-browser/mainThreadDocuments.ts
View File

@@ -234,15 +234,17 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
}, err => this._doCreateUntitled(asFileUri).then(resource => !!resource));
}
private _doCreateUntitled(uri?: URI, modeId?: string, initialValue?: string): TPromise<URI> {
let input = this._untitledEditorService.createOrGet(uri, modeId, initialValue);
return input.resolve(true).then(model => {
if (!this._modelIsSynced[input.getResource().toString()]) {
throw new Error(`expected URI ${input.getResource().toString()} to have come to LIFE`);
private _doCreateUntitled(resource?: URI, modeId?: string, initialValue?: string): TPromise<URI> {
return this._untitledEditorService.loadOrCreate({ resource, modeId, initialValue }).then(model => {
const resource = model.getResource();
if (!this._modelIsSynced[resource.toString()]) {
throw new Error(`expected URI ${resource.toString()} to have come to LIFE`);
}
return this._proxy.$acceptDirtyStateChanged(input.getResource().toString(), true); // mark as dirty
}).then(() => {
return input.getResource();
this._proxy.$acceptDirtyStateChanged(resource.toString(), true); // mark as dirty
return resource;
});
}