Merge branch 'main' into joh/exceptional-yak

Author: jrieken

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

@@ -696,7 +696,9 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 			'security.allowedUNCHosts': {
 				'type': 'array',
 				'items': {
-					'type': 'string'
+					'type': 'string',
+					'pattern': '^[^\\\\]+$',
+					'patternErrorMessage': localize('security.allowedUNCHosts.patternErrorMessage', 'UNC host names must not contain backslashes.')
 				},
 				'default': [],
 				'markdownDescription': localize('security.allowedUNCHosts', 'A set of UNC host names (without leading or trailing backslash, for example `192.168.0.1` or `my-server`) to allow without user confirmation. If a UNC host is being accessed that is not allowed via this setting or has not been acknowledged via user confirmation, an error will occur and the operation stopped. A restart is required when changing this setting. Find out more about this setting at https://aka.ms/vscode-windows-unc.'),

src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController.ts

@@ -596,6 +596,12 @@ export class InteractiveEditorController implements IEditorContribution {
 		}
 	}
 
+	createSnapshot(): void {
+		if (this._activeSession && !this._activeSession.textModel0.equalsTextBuffer(this._activeSession.textModelN.getTextBuffer())) {
+			this._activeSession.createSnapshot();
+		}
+	}
+
 	async applyChanges(): Promise<EditResponse | void> {
 		if (this._strategy) {
 			const strategy = this._strategy;

src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorSession.ts

@@ -8,7 +8,7 @@ import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { ResourceEdit, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
 import { TextEdit } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
+import { ITextModel, ITextSnapshot } from 'vs/editor/common/model';
 import { EditMode, IInteractiveEditorSessionProvider, IInteractiveEditorSession, IInteractiveEditorBulkEditResponse, IInteractiveEditorEditResponse, IInteractiveEditorMessageResponse, IInteractiveEditorResponse, IInteractiveEditorService } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -58,6 +58,7 @@ export class Session {
 
 	private _lastInput: string | undefined;
 	private _lastTextModelChanges: LineRangeMapping[] | undefined;
+	private _lastSnapshot: ITextSnapshot | undefined;
 	private readonly _exchange: SessionExchange[] = [];
 	private readonly _startTime = new Date();
 	private readonly _teldata: Partial<TelemetryData>;
@@ -89,11 +90,19 @@ export class Session {
 		return this._lastInput;
 	}
 
+	get lastSnapshot(): ITextSnapshot | undefined {
+		return this._lastSnapshot;
+	}
+
 	get wholeRange(): Range {
 		return this.textModelN.getDecorationRange(this._wholeRangeMarkerId)!;
 		// return new Range(1, 1, 1, 1);
 	}
 
+	createSnapshot(): void {
+		this._lastSnapshot = this.textModelN.createSnapshot();
+	}
+
 	addExchange(exchange: SessionExchange): void {
 		const newLen = this._exchange.push(exchange);
 		this._teldata.rounds += `${newLen}|`;

src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorStrategies.ts

@@ -23,6 +23,7 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
 import { InteractiveEditorFileCreatePreviewWidget, InteractiveEditorLivePreviewWidget } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorLivePreviewWidget';
 import { EditResponse, Session } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorSession';
 import { InteractiveEditorWidget } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget';
+import { getValueFromSnapshot } from 'vs/workbench/contrib/interactiveEditor/browser/utils';
 import { CTX_INTERACTIVE_EDITOR_INLNE_DIFF, CTX_INTERACTIVE_EDITOR_DOCUMENT_CHANGED } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
 
 export abstract class EditModeStrategy {
@@ -213,7 +214,7 @@ export class LiveStrategy extends EditModeStrategy {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IStorageService protected _storageService: IStorageService,
 		@IBulkEditService protected readonly _bulkEditService: IBulkEditService,
-		@IEditorWorkerService protected readonly _editorWorkerService: IEditorWorkerService
+		@IEditorWorkerService protected readonly _editorWorkerService: IEditorWorkerService,
 	) {
 		super();
 		this._inlineDiffDecorations = new InlineDiffDecorations(this._editor, this._inlineDiffEnabled);
@@ -264,11 +265,16 @@ export class LiveStrategy extends EditModeStrategy {
 	}
 
 	async cancel() {
-		const { textModelN: modelN, textModel0: model0 } = this._session;
-		if (modelN.isDisposed() || model0.isDisposed()) {
+		const { textModelN: modelN, textModel0: model0, lastSnapshot } = this._session;
+		if (modelN.isDisposed() || (model0.isDisposed() && !lastSnapshot)) {
 			return;
 		}
-		const edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: model0.getValue() }]);
+
+		const newText = lastSnapshot
+			? getValueFromSnapshot(lastSnapshot)
+			: model0.getValue();
+
+		const edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: newText }]);
 		if (edits) {
 			const operations = edits.map(e => EditOperation.replace(Range.lift(e.range), e.text));
 			modelN.pushEditOperations(null, operations, () => null);

src/vs/workbench/contrib/interactiveEditor/browser/utils.ts

@@ -5,7 +5,7 @@
 
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
+import { ITextModel, ITextSnapshot } from 'vs/editor/common/model';
 
 export function invertLineRange(range: LineRange, model: ITextModel): LineRange[] {
 	if (range.isEmpty) {
@@ -20,3 +20,15 @@ export function invertLineRange(range: LineRange, model: ITextModel): LineRange[
 export function lineRangeAsRange(r: LineRange): Range {
 	return new Range(r.startLineNumber, 1, r.endLineNumberExclusive - 1, 1);
 }
+
+export function getValueFromSnapshot(snapshot: ITextSnapshot): string {
+	let result = '';
+	while (true) {
+		const chunk = snapshot.read();
+		if (chunk === null) {
+			break;
+		}
+		result += chunk;
+	}
+	return result;
+}

src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts

@@ -7,6 +7,7 @@ import { Iterable } from 'vs/base/common/iterator';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { isEqual } from 'vs/base/common/resources';
 import { ITextModel } from 'vs/editor/common/model';
 import { Range } from 'vs/editor/common/core/range';
 import { ISelection } from 'vs/editor/common/core/selection';
@@ -31,6 +32,8 @@ import { Schemas } from 'vs/base/common/network';
 import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
 import { CTX_INTERACTIVE_EDITOR_FOCUSED, IInteractiveEditorRequest, IInteractiveEditorService } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
 import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { InteractiveEditorController } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 
 const EXECUTE_NOTEBOOK_COMMAND_ID = 'notebook.execute';
@@ -208,7 +211,26 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
 			await context.notebookEditor.focusNotebookCell(context.cell, 'container', { skipReveal: true });
 		}
 
-		return runCell(editorGroupsService, context);
+		let foundEditor: ICodeEditor | undefined = undefined;
+		for (const [, codeEditor] of context.notebookEditor.codeEditors) {
+			if (isEqual(codeEditor.getModel()?.uri, (context.cell ?? context.selectedCells?.[0])?.uri)) {
+				foundEditor = codeEditor;
+				break;
+			}
+		}
+
+		await runCell(editorGroupsService, context);
+
+		if (!foundEditor) {
+			return;
+		}
+
+		const controller = InteractiveEditorController.get(foundEditor);
+		if (!controller) {
+			return;
+		}
+
+		controller.createSnapshot();
 	}
 });