Skip to content

Commit

Permalink
💄
Browse files Browse the repository at this point in the history
  • Loading branch information
bpasero committed Aug 26, 2019
1 parent 3219047 commit 977fac4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
3 changes: 3 additions & 0 deletions src/vs/platform/editor/common/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ export enum EditorActivation {

/**
* Preserve the current active editor.
*
* Note: will only work in combination with the
* `preserveFocus: true` option.
*/
PRESERVE
}
Expand Down
10 changes: 1 addition & 9 deletions src/vs/workbench/services/preferences/common/preferences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,20 +167,12 @@ export class SettingsEditorOptions extends EditorOptions implements ISettingsEdi

static create(settings: ISettingsEditorOptions): SettingsEditorOptions {
const options = new SettingsEditorOptions();
options.overwrite(settings);

options.target = settings.target;
options.folderUri = settings.folderUri;
options.query = settings.query;

// IEditorOptions
options.preserveFocus = settings.preserveFocus;
options.forceReload = settings.forceReload;
options.revealIfVisible = settings.revealIfVisible;
options.revealIfOpened = settings.revealIfOpened;
options.pinned = settings.pinned;
options.index = settings.index;
options.inactive = settings.inactive;

return options;
}
}
Expand Down

0 comments on commit 977fac4

Please sign in to comment.