Merge pull request microsoft#187189 from microsoft/rebornix/excessive-cheetah

Register the notebook remote save setting

Author: rebornix

src/vs/workbench/api/common/extHostNotebook.ts

@@ -328,11 +328,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 		}
 
 		// validate write
-		const statBeforeWrite = await this._validateWriteFile(uri, options);
-
-		if (!statBeforeWrite) {
-			await this._mkdirp(uri);
-		}
+		await this._validateWriteFile(uri, options);
 
 		const data: vscode.NotebookData = {
 			metadata: filter(document.apiNotebook.metadata, key => !(serializer.options?.transientDocumentMetadata ?? {})[key]),
@@ -377,20 +373,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 	}
 
 	private async _validateWriteFile(uri: URI, options: files.IWriteFileOptions) {
-		// File system provider registered in Extension Host doesn't have unlock or atomic support
-		// Validate via file stat meta data
 		const stat = await this._extHostFileSystem.value.stat(uri);
-
-		// File cannot be directory
-		if ((stat.type & files.FileType.Directory) !== 0) {
-			throw new files.FileOperationError(localize('fileIsDirectoryWriteError', "Unable to write file '{0}' that is actually a directory", this._resourceForError(uri)), files.FileOperationResult.FILE_IS_DIRECTORY, options);
-		}
-
-		// File cannot be readonly
-		if ((stat.permissions ?? 0) & files.FilePermission.Readonly) {
-			throw new files.FileOperationError(localize('err.readonly', "Unable to modify read-only file '{0}'", this._resourceForError(uri)), files.FileOperationResult.FILE_PERMISSION_DENIED);
-		}
-
 		// Dirty write prevention
 		if (
 			typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== files.ETAG_DISABLED &&
@@ -400,58 +383,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 			throw new files.FileOperationError(localize('fileModifiedError', "File Modified Since"), files.FileOperationResult.FILE_MODIFIED_SINCE, options);
 		}
 
-		return stat;
-	}
-
-	private async _mkdirp(uri: URI) {
-		const providerExtUri = this._extHostFileSystem.getFileSystemProviderExtUri(uri.scheme);
-		let directory = providerExtUri.dirname(uri);
-
-		const directoriesToCreate: string[] = [];
-
-		while (!providerExtUri.isEqual(directory, providerExtUri.dirname(directory))) {
-			try {
-				const stat = await this._extHostFileSystem.value.stat(directory);
-				if ((stat.type & files.FileType.Directory) === 0) {
-					throw new Error(localize('mkdirExistsError', "Unable to create folder '{0}' that already exists but is not a directory", this._resourceForError(directory)));
-				}
-
-				break; // we have hit a directory that exists -> good
-			} catch (error) {
-
-				// Bubble up any other error that is not file not found
-				if (files.toFileSystemProviderErrorCode(error) !== files.FileSystemProviderErrorCode.FileNotFound) {
-					throw error;
-				}
-
-				// Upon error, remember directories that need to be created
-				directoriesToCreate.push(providerExtUri.basename(directory));
-
-				// Continue up
-				directory = providerExtUri.dirname(directory);
-			}
-		}
-
-		// Create directories as needed
-		for (let i = directoriesToCreate.length - 1; i >= 0; i--) {
-			directory = providerExtUri.joinPath(directory, directoriesToCreate[i]);
-
-			try {
-				await this._extHostFileSystem.value.createDirectory(directory);
-			} catch (error) {
-				if (files.toFileSystemProviderErrorCode(error) !== files.FileSystemProviderErrorCode.FileExists) {
-					// For mkdirp() we tolerate that the mkdir() call fails
-					// in case the folder already exists. This follows node.js
-					// own implementation of fs.mkdir({ recursive: true }) and
-					// reduces the chances of race conditions leading to errors
-					// if multiple calls try to create the same folders
-					// As such, we only throw an error here if it is other than
-					// the fact that the file already exists.
-					// (see also https://github.com/microsoft/vscode/issues/89834)
-					throw error;
-				}
-			}
-		}
+		return;
 	}
 
 	private _resourceForError(uri: URI): string {

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

@@ -984,6 +984,11 @@ configurationRegistry.registerConfiguration({
 				codeOutput: true
 			},
 			tags: ['notebookLayout']
+		},
+		[NotebookSetting.remoteSaving]: {
+			markdownDescription: nls.localize('notebook.remoteSaving', "Enables the incremental saving of notebooks in Remote environment. When enabled, only the changes to the notebook are sent to the extension host, improving performance for large notebooks and slow network connections."),
+			type: 'boolean',
+			default: typeof product.quality === 'string' && product.quality !== 'stable' // only enable as default in insiders
 		}
 	}
 });

src/vs/workbench/contrib/notebook/common/notebookCommon.ts

@@ -952,6 +952,7 @@ export const NotebookSetting = {
 	findScope: 'notebook.find.scope',
 	logging: 'notebook.logging',
 	confirmDeleteRunningCell: 'notebook.confirmDeleteRunningCell',
+	remoteSaving: 'notebook.experimental.remoteSave'
 } as const;
 
 export const enum CellStatusbarAlignment {

src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts

@@ -18,7 +18,7 @@ import { IWriteFileOptions, IFileStatWithMetadata } from 'vs/platform/files/comm
 import { IRevertOptions, ISaveOptions, IUntypedEditorInput } from 'vs/workbench/common/editor';
 import { EditorModel } from 'vs/workbench/common/editor/editorModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { ICellDto2, INotebookEditorModel, INotebookLoadOptions, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookData } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ICellDto2, INotebookEditorModel, INotebookLoadOptions, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookData, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookSerializer, INotebookService, SimpleNotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { IFileWorkingCopyModelConfiguration } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
@@ -215,7 +215,7 @@ export class NotebookFileWorkingCopyModel extends Disposable implements IStoredF
 			};
 
 			// Override save behavior to avoid transferring the buffer across the wire 3 times
-			if (this._configurationService.getValue('notebook.experimental.remoteSave')) {
+			if (this._configurationService.getValue(NotebookSetting.remoteSaving)) {
 				this.save = async (options: IWriteFileOptions, token: CancellationToken) => {
 					const serializer = await this.getNotebookSerializer();