Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'microsoft/master' into movableViews

Browse Source
This commit is contained in:
SteVen Batten
2020-01-17 07:39:53 -08:00
parent ed92290a4f b6e7eaa1bd
commit 55861a8cda
87 changed files with 1216 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/api/browser/mainThreadDocuments.ts
View File

@@ -211,16 +211,15 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
// don't create a new file ontop of an existing file
return Promise.reject(new Error('file already exists'));
}, err => {
return this._doCreateUntitled(uri).then(resource => !!resource);
return this._doCreateUntitled(Boolean(uri.path) ? uri : undefined).then(resource => !!resource);
});
}
private _doCreateUntitled(resource?: URI, mode?: string, initialValue?: string): Promise<URI> {
private _doCreateUntitled(associatedResource?: URI, mode?: string, initialValue?: string): Promise<URI> {
return this._textFileService.untitled.resolve({
resource,
associatedResource,
mode,
initialValue,
useResourcePath: Boolean(resource && resource.path)
initialValue
}).then(model => {
const resource = model.resource;