Merge pull request #146866 from dlech/patch-9

allow null in ICodeEditor.restoreViewState()
microsoft · May 11, 2022 · 66fccc7 · 66fccc7
2 parents 0175770 + 8160478
commit 66fccc7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts
@@ -681,7 +681,7 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	/**
 	 * Restores the view state of the editor from a serializable object generated by `saveViewState`.
 	 */
-	restoreViewState(state: editorCommon.ICodeEditorViewState): void;
+	restoreViewState(state: editorCommon.ICodeEditorViewState | null): void;
 
 	/**
 	 * Returns true if the text inside this editor or an editor widget has focus.
@@ -1116,7 +1116,7 @@ export interface IDiffEditor extends editorCommon.IEditor {
 	/**
 	 * Restores the view state of the editor from a serializable object generated by `saveViewState`.
 	 */
-	restoreViewState(state: editorCommon.IDiffEditorViewState): void;
+	restoreViewState(state: editorCommon.IDiffEditorViewState | null): void;
 
 	/**
 	 * Type the getModel() of IEditor.

diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
@@ -273,7 +273,7 @@ export interface IEditor {
 	/**
 	 * Restores the view state of the editor from a serializable object generated by `saveViewState`.
 	 */
-	restoreViewState(state: IEditorViewState): void;
+	restoreViewState(state: IEditorViewState | null): void;
 
 	/**
 	 * Given a position, returns a column number that takes tab-widths into account.

diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -2373,7 +2373,7 @@ declare namespace monaco.editor {
 		/**
 		 * Restores the view state of the editor from a serializable object generated by `saveViewState`.
 		 */
-		restoreViewState(state: IEditorViewState): void;
+		restoreViewState(state: IEditorViewState | null): void;
 		/**
 		 * Given a position, returns a column number that takes tab-widths into account.
 		 */
@@ -5124,7 +5124,7 @@ declare namespace monaco.editor {
 		/**
 		 * Restores the view state of the editor from a serializable object generated by `saveViewState`.
 		 */
-		restoreViewState(state: ICodeEditorViewState): void;
+		restoreViewState(state: ICodeEditorViewState | null): void;
 		/**
 		 * Returns true if the text inside this editor or an editor widget has focus.
 		 */
@@ -5377,7 +5377,7 @@ declare namespace monaco.editor {
 		/**
 		 * Restores the view state of the editor from a serializable object generated by `saveViewState`.
 		 */
-		restoreViewState(state: IDiffEditorViewState): void;
+		restoreViewState(state: IDiffEditorViewState | null): void;
 		/**
 		 * Type the getModel() of IEditor.
 		 */