drop one-off IW backup/recovery mechanism

Author: amunger

src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts

@@ -19,7 +19,7 @@ import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry'
 import { ITextModel } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { peekViewBorder /*, peekViewEditorBackground, peekViewResultsBackground */ } from 'vs/editor/contrib/peekView/browser/peekView';
+import { peekViewBorder } from 'vs/editor/contrib/peekView/browser/peekView';
 import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/suggest';
 import { localize } from 'vs/nls';
 import { ILocalizedString } from 'vs/platform/action/common/action';
@@ -28,7 +28,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { EditorActivation, IResourceEditorInput } from 'vs/platform/editor/common/editor';
-import { IFileService } from 'vs/platform/files/common/files';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -41,7 +40,6 @@ import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/
 import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
 import { EditorExtensions, EditorsOrder, IEditorFactoryRegistry, IEditorSerializer } from 'vs/workbench/common/editor';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-// import { Color } from 'vs/base/common/color';
 import { PANEL_BORDER } from 'vs/workbench/common/theme';
 import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { InteractiveWindowSetting, INTERACTIVE_INPUT_CURSOR_BOUNDARY } from 'vs/workbench/contrib/interactive/browser/interactiveCommon';
@@ -83,9 +81,7 @@ export class InteractiveDocumentContribution extends Disposable implements IWork
 	constructor(
 		@INotebookService notebookService: INotebookService,
 		@IEditorResolverService editorResolverService: IEditorResolverService,
-		@IEditorService editorService: IEditorService,
-		@IFileService fileService: IFileService,
-		@ILogService logService: ILogService
+		@IEditorService editorService: IEditorService
 	) {
 		super();
 
@@ -252,8 +248,7 @@ export class InteractiveEditorSerializer implements IEditorSerializer {
 		return JSON.stringify({
 			resource: input.primary.resource,
 			inputResource: input.inputResource,
-			name: input.getName(),
-			data: input.getSerialization()
+			name: input.getName()
 		});
 	}
 
@@ -272,7 +267,6 @@ export class InteractiveEditorSerializer implements IEditorSerializer {
 		}
 
 		const input = InteractiveEditorInput.create(instantiationService, resource, inputResource);
-		input.restoreSerialization(data.data);
 		return input;
 	}
 }

src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from 'vs/base/common/buffer';
 import { Event } from 'vs/base/common/event';
 import { IReference } from 'vs/base/common/lifecycle';
 import * as paths from 'vs/base/common/path';
@@ -16,9 +15,7 @@ import { EditorInputCapabilities, GroupIdentifier, ISaveOptions, IUntypedEditorI
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { IInteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService';
 import { IInteractiveHistoryService } from 'vs/workbench/contrib/interactive/browser/interactiveHistoryService';
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, ICellDto2, IOutputDto, IResolvedNotebookEditorModel, NotebookCellCollapseState, NotebookCellInternalMetadata, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { IResolvedNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { ICompositeNotebookEditorInput, NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 
@@ -139,13 +136,7 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 			return this._inputResolver;
 		}
 
-		this._inputResolver = this._resolveEditorModel().then(editorModel => {
-			if (this._data) {
-				editorModel?.notebook.reset(this._data.notebookData.cells.map((cell: ISerializedCell) => deserializeCell(cell)), this._data.notebookData.metadata, this._data.notebookData.transientOptions);
-			}
-
-			return editorModel;
-		});
+		this._inputResolver = this._resolveEditorModel();
 
 		return this._inputResolver;
 	}
@@ -158,10 +149,6 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 		this._interactiveDocumentService.willCreateInteractiveDocument(this.resource!, this.inputResource, language);
 		this._inputModelRef = await this._textModelService.createModelReference(this.inputResource);
 
-		if (this._data && this._data.inputData) {
-			this._inputModelRef.object.textEditorModel.setValue(this._data.inputData.value);
-		}
-
 		return this._inputModelRef.object.textEditorModel;
 	}
 
@@ -222,37 +209,6 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 		return basename.substr(0, basename.length - paths.extname(p).length);
 	}
 
-	getSerialization(): { notebookData: any | undefined; inputData: any | undefined } {
-		return {
-			notebookData: this._serializeNotebook(this._editorModelReference?.notebook),
-			inputData: this._inputModelRef ? {
-				value: this._inputModelRef.object.textEditorModel.getValue(),
-				language: this._inputModelRef.object.textEditorModel.getLanguageId()
-			} : undefined
-		};
-	}
-
-	private _data: { notebookData: any | undefined; inputData: any | undefined } | undefined;
-
-	async restoreSerialization(data: { notebookData: any | undefined; inputData: any | undefined } | undefined) {
-		this._data = data;
-	}
-
-	private _serializeNotebook(notebook?: NotebookTextModel) {
-		if (!notebook) {
-			return undefined;
-		}
-
-		const cells = notebook.cells.map(cell => serializeCell(cell));
-
-		return {
-			cells: cells,
-			metadata: notebook.metadata,
-			transientOptions: notebook.transientOptions
-		};
-	}
-
-
 	override dispose() {
 		// we support closing the interactive window without prompt, so the editor model should not be dirty
 		this._editorModelReference?.revert({ soft: true });
@@ -270,74 +226,3 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 		return this._historyService;
 	}
 }
-
-/**
- * Serialization of interactive notebook.
- * This is not placed in notebook land as regular notebooks are handled by file service directly.
- */
-
-interface ISerializedOutputItem {
-	readonly mime: string;
-	readonly data: number[];
-}
-
-interface ISerializedCellOutput {
-	outputs: ISerializedOutputItem[];
-	metadata?: Record<string, any>;
-	outputId: string;
-}
-
-export interface ISerializedCell {
-	source: string;
-	language: string;
-	mime: string | undefined;
-	cellKind: CellKind;
-	outputs: ISerializedCellOutput[];
-	metadata?: NotebookCellMetadata;
-	internalMetadata?: NotebookCellInternalMetadata;
-	collapseState?: NotebookCellCollapseState;
-}
-
-function serializeCell(cell: NotebookCellTextModel): ISerializedCell {
-	return {
-		cellKind: cell.cellKind,
-		language: cell.language,
-		metadata: cell.metadata,
-		mime: cell.mime,
-		outputs: cell.outputs.map(output => serializeCellOutput(output)),
-		source: cell.getValue()
-	};
-}
-
-function deserializeCell(cell: ISerializedCell): ICellDto2 {
-	return {
-		cellKind: cell.cellKind,
-		source: cell.source,
-		language: cell.language,
-		metadata: cell.metadata,
-		mime: cell.mime,
-		outputs: cell.outputs.map((output) => deserializeCellOutput(output))
-	};
-}
-
-function serializeCellOutput(output: IOutputDto): ISerializedCellOutput {
-	return {
-		outputId: output.outputId,
-		outputs: output.outputs.map(ot => ({
-			mime: ot.mime,
-			data: ot.data.buffer ? Array.from(ot.data.buffer) : []
-		})),
-		metadata: output.metadata
-	};
-}
-
-function deserializeCellOutput(output: ISerializedCellOutput): IOutputDto {
-	return {
-		outputId: output.outputId,
-		outputs: output.outputs.map(ot => ({
-			mime: ot.mime,
-			data: VSBuffer.fromByteArray(ot.data)
-		})),
-		metadata: output.metadata
-	};
-}