Skip to content

Commit

Permalink
Merge branch 'main' into feat/add-polling-watcher
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaaaash authored Jan 21, 2025
2 parents 5627598 + 5530a45 commit 13e7b26
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions packages/editor/src/browser/workbench-editor.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,7 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
this._onDidEditorGroupsChanged.fire();
}),
);

const editorRestorePromises = [];
const promise = this.topGrid
.deserialize(state, () => this.createEditorGroup(), editorRestorePromises)
Expand Down Expand Up @@ -2313,16 +2314,9 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
async restoreState(state: IEditorGroupState) {
this._restoringState = true;
this.previewURI = state.uris[state.previewIndex] ? new URI(state.uris[state.previewIndex]) : null;
await Promise.all(
state.uris.map(async (uri) => {
await this.doOpen(new URI(uri), {
disableNavigate: true,
backend: true,
preview: false,
deletedPolicy: 'skip',
});
}),
);
for (const uri of state.uris) {
await this.doOpen(new URI(uri), { disableNavigate: true, backend: true, preview: false, deletedPolicy: 'skip' });
}

let targetUri: URI | undefined;
if (state.current) {
Expand Down

0 comments on commit 13e7b26

Please sign in to comment.