Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

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

@@ -82,15 +82,26 @@ export interface IResourceInput extends IBaseResourceInput {
 export enum EditorActivation {
 
 	/**
-	 * Activate the editor after it opened.
+	 * Activate the editor after it opened. This will automatically restore
+	 * the editor if it is minimized.
 	 */
 	ACTIVATE,
 
+	/**
+	 * Only restore the editor if it is minimized but do not activate it.
+	 *
+	 * Note: will only work in combination with the `preserveFocus: true` option.
+	 * Otherwise, if focus moves into the editor, it will activate and restore
+	 * automatically.
+	 */
+	RESTORE,
+
 	/**
 	 * Preserve the current active editor.
 	 *
-	 * Note: will only work in combination with the
-	 * `preserveFocus: true` option.
+	 * Note: will only work in combination with the `preserveFocus: true` option.
+	 * Otherwise, if focus moves into the editor, it will activate and restore
+	 * automatically.
 	 */
 	PRESERVE
 }
@@ -107,7 +118,8 @@ export interface IEditorOptions {
 
 	/**
 	 * 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.
+	 * already and allows to control if the inactive group should become active, restored
+	 * or preserved.
 	 *
 	 * By default, the editor group will become active unless `preserveFocus` or `inactive`
 	 * is specified.
@@ -162,6 +174,11 @@ export interface IEditorOptions {
 	 * message as needed. By default, an error will be presented as notification if opening was not possible.
 	 */
 	readonly ignoreError?: boolean;
+
+	/**
+	 * Does not use editor overrides while opening the editor
+	 */
+	readonly ignoreOverrides?: boolean;
 }
 
 export interface ITextEditorSelection {