提交 742bae22 编写于 作者: B Benjamin Pasero

finish fix #64596

上级 e52ffb28
...@@ -213,8 +213,8 @@ export class WindowsChannelClient implements IWindowsService { ...@@ -213,8 +213,8 @@ export class WindowsChannelClient implements IWindowsService {
} }
getRecentlyOpened(windowId: number): TPromise<IRecentlyOpened> { getRecentlyOpened(windowId: number): TPromise<IRecentlyOpened> {
return TPromise.wrap<IRecentlyOpened>(this.channel.call('getRecentlyOpened', windowId)) return this.channel.call('getRecentlyOpened', windowId)
.then(recentlyOpened => { .then((recentlyOpened: IRecentlyOpened) => {
recentlyOpened.workspaces = recentlyOpened.workspaces.map(workspace => isWorkspaceIdentifier(workspace) ? workspace : URI.revive(workspace)); recentlyOpened.workspaces = recentlyOpened.workspaces.map(workspace => isWorkspaceIdentifier(workspace) ? workspace : URI.revive(workspace));
recentlyOpened.files = recentlyOpened.files.map(URI.revive); recentlyOpened.files = recentlyOpened.files.map(URI.revive);
return recentlyOpened; return recentlyOpened;
......
...@@ -240,7 +240,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { ...@@ -240,7 +240,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
return this.doOpenEditor(targetGroup, typedInput, editorOptions); return this.doOpenEditor(targetGroup, typedInput, editorOptions);
} }
return TPromise.wrap<IEditor>(null); return Promise.resolve(null);
} }
protected doOpenEditor(group: IEditorGroup, editor: IEditorInput, options?: IEditorOptions): TPromise<IEditor> { protected doOpenEditor(group: IEditorGroup, editor: IEditorInput, options?: IEditorOptions): TPromise<IEditor> {
......
...@@ -207,7 +207,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil ...@@ -207,7 +207,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
revert(soft?: boolean): TPromise<void> { revert(soft?: boolean): TPromise<void> {
if (!this.isResolved()) { if (!this.isResolved()) {
return TPromise.wrap<void>(null); return Promise.resolve(null);
} }
// Cancel any running auto-save // Cancel any running auto-save
...@@ -584,7 +584,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil ...@@ -584,7 +584,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
save(options: ISaveOptions = Object.create(null)): TPromise<void> { save(options: ISaveOptions = Object.create(null)): TPromise<void> {
if (!this.isResolved()) { if (!this.isResolved()) {
return TPromise.wrap<void>(null); return Promise.resolve(null);
} }
this.logService.trace('save() - enter', this.resource); this.logService.trace('save() - enter', this.resource);
...@@ -623,7 +623,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil ...@@ -623,7 +623,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
if ((!options.force && !this.dirty) || versionId !== this.versionId) { if ((!options.force && !this.dirty) || versionId !== this.versionId) {
this.logService.trace(`doSave(${versionId}) - exit - because not dirty and/or versionId is different (this.isDirty: ${this.dirty}, this.versionId: ${this.versionId})`, this.resource); this.logService.trace(`doSave(${versionId}) - exit - because not dirty and/or versionId is different (this.isDirty: ${this.dirty}, this.versionId: ${this.versionId})`, this.resource);
return TPromise.wrap<void>(null); return Promise.resolve(null);
} }
// Return if currently saving by storing this save request as the next save that should happen. // Return if currently saving by storing this save request as the next save that should happen.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册