Merge pull request microsoft#185900 from microsoft/hediet/b/sporting-flamingo

Don't render revert arrows for readonly files

Author: hediet

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts

@@ -21,7 +21,7 @@ export class DiffEditorDecorations extends Disposable {
 		private readonly _originalEditor: CodeEditorWidget,
 		private readonly _modifiedEditor: CodeEditorWidget,
 		private readonly _diffModel: IObservable<DiffModel | undefined>,
-		private readonly _renderSideBySide: IObservable<boolean>,
+		private readonly _shouldRenderRevertArrows: IObservable<boolean>,
 	) {
 		super();
 
@@ -64,7 +64,7 @@ export class DiffEditorDecorations extends Disposable {
 				modifiedDecorations.push({ range: i.modifiedRange, options: i.modifiedRange.isEmpty() ? diffAddDecorationEmpty : diffAddDecoration });
 			}
 
-			if (!m.lineRangeMapping.modifiedRange.isEmpty && this._renderSideBySide.read(reader) && !currentMove) {
+			if (!m.lineRangeMapping.modifiedRange.isEmpty && this._shouldRenderRevertArrows.read(reader) && !currentMove) {
 				modifiedDecorations.push({ range: Range.fromPositions(new Position(m.lineRangeMapping.modifiedRange.startLineNumber, 1)), options: arrowRevertChange });
 			}
 		}

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts

@@ -29,7 +29,7 @@ import { OverviewRulerPart } from 'vs/editor/browser/widget/diffEditorWidget2/ov
 import { UnchangedRangesFeature } from 'vs/editor/browser/widget/diffEditorWidget2/unchangedRanges';
 import { ObservableElementSizeObserver, applyStyle, deepMerge, readHotReloadableExport } from 'vs/editor/browser/widget/diffEditorWidget2/utils';
 import { WorkerBasedDocumentDiffProvider } from 'vs/editor/browser/widget/workerBasedDocumentDiffProvider';
-import { EditorOptions, IDiffEditorOptions, IEditorOptions, ValidDiffEditorBaseOptions, clampedFloat, clampedInt, boolean as validateBooleanOption, stringSet as validateStringSetOption } from 'vs/editor/common/config/editorOptions';
+import { EditorOption, EditorOptions, IDiffEditorOptions, IEditorOptions, ValidDiffEditorBaseOptions, clampedFloat, clampedInt, boolean as validateBooleanOption, stringSet as validateStringSetOption } from 'vs/editor/common/config/editorOptions';
 import { IDimension } from 'vs/editor/common/core/dimension';
 import { Position } from 'vs/editor/common/core/position';
 import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
@@ -87,7 +87,19 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 	private readonly _boundarySashes = observableValue<IBoundarySashes | undefined>('boundarySashes', undefined);
 	private readonly _renderOverviewRuler = derived('renderOverviewRuler', reader => this._options.read(reader).renderOverviewRuler);
 	private readonly _renderSideBySide = derived('renderSideBySide', reader => this._options.read(reader).renderSideBySide);
-
+	private readonly _shouldRenderRevertArrows = derived('shouldRenderRevertArrows', (reader) => {
+		if (!this._options.read(reader).renderMarginRevertIcon) {
+			return false;
+		}
+		if (!this._renderSideBySide.read(reader)) {
+			return false;
+		}
+		this._options.read(reader); // TODO@hediet editor options should be revisited. _options might just get partial updates.
+		if (this._modifiedEditor.getOption(EditorOption.readOnly)) {
+			return false;
+		}
+		return true;
+	});
 	private unchangedRangesFeature!: UnchangedRangesFeature;
 
 	private readonly _reviewPane: DiffReview2;
@@ -154,7 +166,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 
 		this._register(autorunWithStore2('decorations', (reader, store) => {
 			store.add(new (readHotReloadableExport(DiffEditorDecorations, reader))(
-				this._originalEditor, this._modifiedEditor, this._diffModel, this._renderSideBySide,
+				this._originalEditor, this._modifiedEditor, this._diffModel, this._shouldRenderRevertArrows,
 			));
 		}));
 
@@ -164,6 +176,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 			this._modifiedEditor,
 			this._diffModel,
 			this._renderSideBySide,
+			this._shouldRenderRevertArrows,
 			this,
 			() => this.unchangedRangesFeature.isUpdatingViewZones,
 		));

src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts

@@ -52,6 +52,7 @@ export class ViewZoneManager extends Disposable {
 		private readonly _modifiedEditor: CodeEditorWidget,
 		private readonly _diffModel: IObservable<DiffModel | undefined>,
 		private readonly _renderSideBySide: IObservable<boolean>,
+		private readonly _shouldRenderRevertArrows: IObservable<boolean>,
 		private readonly _diffEditorWidget: DiffEditorWidget2,
 		private readonly _canIgnoreViewZoneUpdateEvent: () => boolean,
 		@IClipboardService private readonly _clipboardService: IClipboardService,
@@ -264,7 +265,7 @@ export class ViewZoneManager extends Disposable {
 						}
 
 						let marginDomNode: HTMLElement | undefined = undefined;
-						if (a.diff && a.diff.modifiedRange.isEmpty && this._renderSideBySide.read(reader)) {
+						if (a.diff && a.diff.modifiedRange.isEmpty && this._shouldRenderRevertArrows.read(reader)) {
 							marginDomNode = createViewZoneMarginArrow();
 						}