Merge from vscode 91e99652cd5fcfc072387c64e151b435e39e8dcf (#6962)

src/vs/platform/editor/common/editor.ts

@@ -79,14 +79,41 @@ export interface IResourceInput extends IBaseResourceInput {
 	readonly mode?: string;
 }
 
+export enum EditorActivation {
+
+	/**
+	 * Activate the editor after it opened.
+	 */
+	ACTIVATE,
+
+	/**
+	 * Preserve the current active editor.
+	 *
+	 * Note: will only work in combination with the
+	 * `preserveFocus: true` option.
+	 */
+	PRESERVE
+}
+
 export interface IEditorOptions {
 
 	/**
-	 * Tells the editor to not receive keyboard focus when the editor is being opened. By default,
-	 * the editor will receive keyboard focus on open.
+	 * Tells the editor to not receive keyboard focus when the editor is being opened.
+	 *
+	 * Will also not activate the group the editor opens in unless the group is already
+	 * the active one. This behaviour can be overridden via the `activation` option.
 	 */
 	readonly preserveFocus?: boolean;
 
+	/**
+	 * This option is only relevant if an editor is opened into a group that is not active
+	 * already and allows to control if the inactive group should become active or not.
+	 *
+	 * By default, the editor group will become active unless `preserveFocus` or `inactive`
+	 * is specified.
+	 */
+	readonly activation?: EditorActivation;
+
 	/**
 	 * Tells the editor to reload the editor input in the editor even if it is identical to the one
 	 * already showing. By default, the editor will not reload the input if it is identical to the
@@ -123,7 +150,10 @@ export interface IEditorOptions {
 
 	/**
 	 * An active editor that is opened will show its contents directly. Set to true to open an editor
-	 * in the background.
+	 * in the background without loading its contents.
+	 *
+	 * Will also not activate the group the editor opens in unless the group is already
+	 * the active one. This behaviour can be overridden via the `activation` option.
 	 */
 	readonly inactive?: boolean;