Removes legacy diff editor. (#191989)

* Removes legacy diff editor. * Fixes CI * Fixes CI
2026-02-15 07:28:05 +00:00 · 2023-09-04 22:45:27 +02:00
parent b9e4141833
commit e0e970f76b
22 changed files with 57 additions and 4139 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -151,5 +151,4 @@
 	"application.experimental.rendererProfiling": true,
 	"editor.experimental.asyncTokenization": true,
 	"editor.experimental.asyncTokenizationVerification": true,
-	"diffEditor.experimental.useVersion2": true,
 }
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -89,7 +89,6 @@ declare namespace monaco {
 }

 declare namespace monaco.editor {
-#include(vs/editor/browser/widget/diffNavigator): IDiffNavigator
 #includeAll(vs/editor/standalone/browser/standaloneEditor;languages.Token=>Token):
 #include(vs/editor/standalone/common/standaloneTheme): BuiltinTheme, IStandaloneThemeData, IColors
 #include(vs/editor/common/languages/supports/tokenization): ITokenThemeRule
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
--- a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
@@ -4,6 +4,7 @@
 *--------------------------------------------------------------------------------------------*/

 import { addDisposableListener, addStandardDisposableListener, reset } from 'vs/base/browser/dom';
+import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { Action } from 'vs/base/common/actions';
@@ -16,7 +17,6 @@ import { ThemeIcon } from 'vs/base/common/themables';
 import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
 import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors';
 import { applyStyle } from 'vs/editor/browser/widget/diffEditorWidget2/utils';
-import { DiffReview } from 'vs/editor/browser/widget/diffReview';
 import { EditorFontLigatures, EditorOption, IComputedEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
@@ -39,6 +39,8 @@ const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codico
 const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, localize('accessibleDiffViewerCloseIcon', 'Icon for \'Close\' in accessible diff viewer.'));

 export class AccessibleDiffViewer extends Disposable {
+	public static _ttPolicy = createTrustedTypesPolicy('diffReview', { createHTML: value => value });
+
 	constructor(
 		private readonly _parentNode: HTMLElement,
 		private readonly _visible: IObservable<boolean>,
@@ -590,15 +592,15 @@ class View extends Disposable {
 		let lineContent: string;
 		if (item.modifiedLineNumber !== undefined) {
 			let html: string | TrustedHTML = this._getLineHtml(modifiedModel, modifiedOptions, modifiedModelOpts.tabSize, item.modifiedLineNumber, this._languageService.languageIdCodec);
-			if (DiffReview._ttPolicy) {
-				html = DiffReview._ttPolicy.createHTML(html as string);
+			if (AccessibleDiffViewer._ttPolicy) {
+				html = AccessibleDiffViewer._ttPolicy.createHTML(html as string);
 			}
 			cell.insertAdjacentHTML('beforeend', html as string);
 			lineContent = modifiedModel.getLineContent(item.modifiedLineNumber);
 		} else {
 			let html: string | TrustedHTML = this._getLineHtml(originalModel, originalOptions, originalModelOpts.tabSize, item.originalLineNumber, this._languageService.languageIdCodec);
-			if (DiffReview._ttPolicy) {
-				html = DiffReview._ttPolicy.createHTML(html as string);
+			if (AccessibleDiffViewer._ttPolicy) {
+				html = AccessibleDiffViewer._ttPolicy.createHTML(html as string);
 			}
 			cell.insertAdjacentHTML('beforeend', html as string);
 			lineContent = originalModel.getLineContent(item.originalLineNumber);
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
@@ -8,7 +8,6 @@ import { IObservable, IReader, autorunHandleChanges, observableFromEvent } from
 import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
 import { IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
 import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
-import { IDiffCodeEditorWidgetOptions } from 'vs/editor/browser/widget/diffEditorWidget';
 import { OverviewRulerPart } from 'vs/editor/browser/widget/diffEditorWidget2/overviewRulerPart';
 import { EditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IContentSizeChangedEvent } from 'vs/editor/common/editorCommon';
@@ -17,6 +16,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DiffEditorOptions } from './diffEditorOptions';
 import { ITextModel } from 'vs/editor/common/model';
+import { IDiffCodeEditorWidgetOptions } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';

 export class DiffEditorEditors extends Disposable {
 	public readonly modified: CodeEditorWidget;
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
@@ -15,7 +15,6 @@ import { ICodeEditor, IDiffEditor, IDiffEditorConstructionOptions, IMouseTargetV
 import { EditorExtensionsRegistry, IDiffEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
-import { IDiffCodeEditorWidgetOptions } from 'vs/editor/browser/widget/diffEditorWidget';
 import { AccessibleDiffViewer } from 'vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer';
 import { DiffEditorDecorations } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations';
 import { DiffEditorSash } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorSash';
@@ -46,7 +45,14 @@ import { DiffEditorEditors } from './diffEditorEditors';
 import { DiffEditorOptions } from './diffEditorOptions';
 import { DiffEditorViewModel, DiffMapping, DiffState } from './diffEditorViewModel';

+export interface IDiffCodeEditorWidgetOptions {
+	originalEditor?: ICodeEditorWidgetOptions;
+	modifiedEditor?: ICodeEditorWidgetOptions;
+}
+
 export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
+	public static ENTIRE_DIFF_OVERVIEW_WIDTH = OverviewRulerPart.ENTIRE_DIFF_OVERVIEW_WIDTH;
+
 	private readonly elements = h('div.monaco-diff-editor.side-by-side', { style: { position: 'relative', height: '100%' } }, [
 		h('div.noModificationsOverlay@overlay', { style: { position: 'absolute', height: '100%', visibility: 'hidden', } }, [$('span', {}, 'No Changes')]),
 		h('div.editor.original@original', { style: { position: 'absolute', height: '100%' } }),
@@ -279,6 +285,10 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 		}));
 	}

+	public getViewWidth(): number {
+		return this._rootSizeObserver.width.get();
+	}
+
 	public getContentHeight() {
 		return this._editors.modified.getContentHeight();
 	}
--- a/src/vs/editor/browser/widget/diffEditorWidget2/renderLines.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/renderLines.ts
@@ -3,9 +3,9 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

+import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
 import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { diffEditorWidgetTtPolicy } from 'vs/editor/browser/widget/diffEditorWidget';
 import { EditorFontLigatures, EditorOption, FindComputedEditorOptionValueById } from 'vs/editor/common/config/editorOptions';
 import { FontInfo } from 'vs/editor/common/config/fontInfo';
 import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
@@ -15,7 +15,7 @@ import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
 import { RenderLineInput, renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
 import { InlineDecoration, ViewLineRenderingData } from 'vs/editor/common/viewModel';

-const ttPolicy = diffEditorWidgetTtPolicy;
+const ttPolicy = createTrustedTypesPolicy('diffEditorWidget', { createHTML: value => value });

 export function renderLines(source: LineSource, options: RenderOptions, decorations: InlineDecoration[], domNode: HTMLElement): RenderLinesResult {
 	applyFontInfo(domNode, options.fontInfo);
--- a/src/vs/editor/browser/widget/diffNavigator.ts
+++ b/src/vs/editor/browser/widget/diffNavigator.ts
@@ -1,278 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'vs/base/common/assert';
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
-import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
-import { Range } from 'vs/editor/common/core/range';
-import { ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { AudioCue, IAudioCueService } from 'vs/platform/audioCues/browser/audioCueService';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-
-
-interface IDiffRange {
-	rhs: boolean;
-	range: Range;
-}
-
-export interface Options {
-	followsCaret?: boolean;
-	ignoreCharChanges?: boolean;
-	alwaysRevealFirst?: boolean;
-	findResultLoop?: boolean;
-}
-
-const defaultOptions: Options = {
-	followsCaret: true,
-	ignoreCharChanges: true,
-	alwaysRevealFirst: true,
-	findResultLoop: true
-};
-
-export interface IDiffNavigator {
-	canNavigate(): boolean;
-	next(): void;
-	previous(): void;
-	dispose(): void;
-}
-
-/**
- * Create a new diff navigator for the provided diff editor.
- */
-export class DiffNavigator extends Disposable implements IDiffNavigator {
-
-	private readonly _editor: IDiffEditor;
-	private readonly _options: Options;
-	private readonly _onDidUpdate = this._register(new Emitter<this>());
-
-	readonly onDidUpdate: Event<this> = this._onDidUpdate.event;
-
-	private disposed: boolean;
-	public revealFirst: boolean;
-	private nextIdx: number;
-	private ranges: IDiffRange[];
-	private ignoreSelectionChange: boolean;
-
-	constructor(
-		editor: IDiffEditor,
-		options: Options = {},
-		@IAudioCueService private readonly _audioCueService: IAudioCueService,
-		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
-		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
-	) {
-		super();
-		this._editor = editor;
-		this._options = objects.mixin(options, defaultOptions, false);
-
-		this.disposed = false;
-
-		this.nextIdx = -1;
-		this.ranges = [];
-		this.ignoreSelectionChange = false;
-		this.revealFirst = Boolean(this._options.alwaysRevealFirst);
-
-		this._register(this._editor.onDidUpdateDiff(() => this._onDiffUpdated()));
-
-		if (this._options.followsCaret) {
-			this._register(this._editor.getModifiedEditor().onDidChangeCursorPosition((e: ICursorPositionChangedEvent) => {
-				if (this.ignoreSelectionChange) {
-					return;
-				}
-				this._updateAccessibilityState(e.position.lineNumber);
-				this.nextIdx = -1;
-			}));
-		}
-
-		// init things
-		this._init();
-	}
-
-	private _init(): void {
-		const changes = this._editor.getLineChanges();
-		if (!changes) {
-			return;
-		}
-	}
-
-	private _onDiffUpdated(): void {
-		this._init();
-
-		this._compute(this._editor.getLineChanges());
-		if (this.revealFirst) {
-			// Only reveal first on first non-null changes
-			if (this._editor.getLineChanges() !== null) {
-				this.revealFirst = false;
-				this.nextIdx = -1;
-				this.next(ScrollType.Immediate);
-			}
-		}
-	}
-
-	private _compute(lineChanges: ILineChange[] | null): void {
-
-		// new ranges
-		this.ranges = [];
-
-		if (lineChanges) {
-			// create ranges from changes
-			lineChanges.forEach((lineChange) => {
-
-				if (!this._options.ignoreCharChanges && lineChange.charChanges) {
-
-					lineChange.charChanges.forEach((charChange) => {
-						this.ranges.push({
-							rhs: true,
-							range: new Range(
-								charChange.modifiedStartLineNumber,
-								charChange.modifiedStartColumn,
-								charChange.modifiedEndLineNumber,
-								charChange.modifiedEndColumn)
-						});
-					});
-
-				} else {
-					if (lineChange.modifiedEndLineNumber === 0) {
-						// a deletion
-						this.ranges.push({
-							rhs: true,
-							range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedStartLineNumber + 1, 1)
-						});
-					} else {
-						// an insertion or modification
-						this.ranges.push({
-							rhs: true,
-							range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber + 1, 1)
-						});
-					}
-				}
-			});
-		}
-
-		// sort
-		this.ranges.sort((left, right) => Range.compareRangesUsingStarts(left.range, right.range));
-		this._onDidUpdate.fire(this);
-	}
-
-	private _initIdx(fwd: boolean): void {
-		let found = false;
-		const position = this._editor.getPosition();
-		if (!position) {
-			this.nextIdx = 0;
-			return;
-		}
-		for (let i = 0, len = this.ranges.length; i < len && !found; i++) {
-			const range = this.ranges[i].range;
-			if (position.isBeforeOrEqual(range.getStartPosition())) {
-				this.nextIdx = i + (fwd ? 0 : -1);
-				found = true;
-			}
-		}
-		if (!found) {
-			// after the last change
-			this.nextIdx = fwd ? 0 : this.ranges.length - 1;
-		}
-		if (this.nextIdx < 0) {
-			this.nextIdx = this.ranges.length - 1;
-		}
-	}
-
-	private _move(fwd: boolean, scrollType: ScrollType): void {
-		assert.ok(!this.disposed, 'Illegal State - diff navigator has been disposed');
-
-		if (!this.canNavigate()) {
-			return;
-		}
-
-		if (this.nextIdx === -1) {
-			this._initIdx(fwd);
-
-		} else if (fwd) {
-			this.nextIdx += 1;
-			if (this.nextIdx >= this.ranges.length) {
-				this.nextIdx = 0;
-			}
-		} else {
-			this.nextIdx -= 1;
-			if (this.nextIdx < 0) {
-				this.nextIdx = this.ranges.length - 1;
-			}
-		}
-
-		const info = this.ranges[this.nextIdx];
-		this.ignoreSelectionChange = true;
-		try {
-			const pos = info.range.getStartPosition();
-			this._editor.setPosition(pos);
-			this._editor.revealRangeInCenter(info.range, scrollType);
-			this._updateAccessibilityState(pos.lineNumber, true);
-		} finally {
-			this.ignoreSelectionChange = false;
-		}
-	}
-
-	_updateAccessibilityState(lineNumber: number, jumpToChange?: boolean): void {
-		const modifiedEditor = this._editor.getModel()?.modified;
-		if (!modifiedEditor) {
-			return;
-		}
-		const insertedOrModified = modifiedEditor.getLineDecorations(lineNumber).find(l => l.options.className === 'line-insert');
-		if (insertedOrModified) {
-			this._audioCueService.playAudioCue(AudioCue.diffLineModified, { allowManyInParallel: true });
-		} else if (jumpToChange) {
-			// The modified editor does not include deleted lines, but when
-			// we are moved to the area where lines were deleted, play this cue
-			this._audioCueService.playAudioCue(AudioCue.diffLineDeleted, { allowManyInParallel: true });
-		} else {
-			return;
-		}
-
-		const codeEditor = this._codeEditorService.getActiveCodeEditor();
-		if (jumpToChange && codeEditor && insertedOrModified && this._accessibilityService.isScreenReaderOptimized()) {
-			codeEditor.setSelection({ startLineNumber: lineNumber, startColumn: 0, endLineNumber: lineNumber, endColumn: Number.MAX_VALUE });
-			codeEditor.writeScreenReaderContent('diff-navigation');
-		}
-	}
-
-	canNavigate(): boolean {
-		return this.ranges && this.ranges.length > 0;
-	}
-
-	next(scrollType: ScrollType = ScrollType.Smooth): void {
-		if (!this.canNavigateNext()) {
-			return;
-		}
-		this._move(true, scrollType);
-	}
-
-	previous(scrollType: ScrollType = ScrollType.Smooth): void {
-		if (!this.canNavigatePrevious()) {
-			return;
-		}
-		this._move(false, scrollType);
-	}
-
-	canNavigateNext(): boolean {
-		return this.canNavigateLoop() || this.nextIdx < this.ranges.length - 1;
-	}
-
-	canNavigatePrevious(): boolean {
-		return this.canNavigateLoop() || this.nextIdx !== 0;
-	}
-
-	canNavigateLoop(): boolean {
-		return Boolean(this._options.findResultLoop);
-	}
-
-	override dispose(): void {
-		super.dispose();
-		this.ranges = [];
-		this.disposed = true;
-	}
-}
--- a/src/vs/editor/browser/widget/diffReview.ts
+++ b/src/vs/editor/browser/widget/diffReview.ts
@@ -1,826 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as dom from 'vs/base/browser/dom';
-import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { Action } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Constants } from 'vs/base/common/uint';
-import 'vs/css!./media/diffReview';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
-import { EditorFontLigatures, EditorOption, IComputedEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { ScrollType } from 'vs/editor/common/editorCommon';
-import { ILanguageIdCodec } from 'vs/editor/common/languages';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
-import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { RenderLineInput, renderViewLine2 as renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { ViewLineRenderingData } from 'vs/editor/common/viewModel';
-import * as nls from 'vs/nls';
-import { AudioCue, IAudioCueService } from 'vs/platform/audioCues/browser/audioCueService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-
-const DIFF_LINES_PADDING = 3;
-
-const enum DiffEntryType {
-	Equal = 0,
-	Insert = 1,
-	Delete = 2
-}
-
-class DiffEntry {
-	readonly originalLineStart: number;
-	readonly originalLineEnd: number;
-	readonly modifiedLineStart: number;
-	readonly modifiedLineEnd: number;
-
-	constructor(originalLineStart: number, originalLineEnd: number, modifiedLineStart: number, modifiedLineEnd: number) {
-		this.originalLineStart = originalLineStart;
-		this.originalLineEnd = originalLineEnd;
-		this.modifiedLineStart = modifiedLineStart;
-		this.modifiedLineEnd = modifiedLineEnd;
-	}
-
-	public getType(): DiffEntryType {
-		if (this.originalLineStart === 0) {
-			return DiffEntryType.Insert;
-		}
-		if (this.modifiedLineStart === 0) {
-			return DiffEntryType.Delete;
-		}
-		return DiffEntryType.Equal;
-	}
-}
-
-const enum DiffEditorLineClasses {
-	Insert = 'line-insert',
-	Delete = 'line-delete'
-}
-
-class Diff {
-	readonly entries: DiffEntry[];
-
-	constructor(entries: DiffEntry[]) {
-		this.entries = entries;
-	}
-}
-
-const diffReviewInsertIcon = registerIcon('diff-review-insert', Codicon.add, nls.localize('diffReviewInsertIcon', 'Icon for \'Insert\' in diff review.'));
-const diffReviewRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, nls.localize('diffReviewRemoveIcon', 'Icon for \'Remove\' in diff review.'));
-const diffReviewCloseIcon = registerIcon('diff-review-close', Codicon.close, nls.localize('diffReviewCloseIcon', 'Icon for \'Close\' in diff review.'));
-
-export class DiffReview extends Disposable {
-
-	public static _ttPolicy = createTrustedTypesPolicy('diffReview', { createHTML: value => value });
-
-	private readonly _diffEditor: DiffEditorWidget;
-	private _isVisible: boolean;
-	public readonly shadow: FastDomNode<HTMLElement>;
-	private readonly _actionBar: ActionBar;
-	public readonly actionBarContainer: FastDomNode<HTMLElement>;
-	public readonly domNode: FastDomNode<HTMLElement>;
-	private readonly _content: FastDomNode<HTMLElement>;
-	private readonly scrollbar: DomScrollableElement;
-	private _diffs: Diff[];
-	private _currentDiff: Diff | null;
-
-	constructor(
-		diffEditor: DiffEditorWidget,
-		@ILanguageService private readonly _languageService: ILanguageService,
-		@IAudioCueService private readonly _audioCueService: IAudioCueService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService
-	) {
-		super();
-		this._diffEditor = diffEditor;
-		this._isVisible = false;
-
-		this.shadow = createFastDomNode(document.createElement('div'));
-		this.shadow.setClassName('diff-review-shadow');
-
-		this.actionBarContainer = createFastDomNode(document.createElement('div'));
-		this.actionBarContainer.setClassName('diff-review-actions');
-		this._actionBar = this._register(new ActionBar(
-			this.actionBarContainer.domNode
-		));
-
-		this._actionBar.push(new Action('diffreview.close', nls.localize('label.close', "Close"), 'close-diff-review ' + ThemeIcon.asClassName(diffReviewCloseIcon), true, async () => this.hide()), { label: false, icon: true });
-
-		this.domNode = createFastDomNode(document.createElement('div'));
-		this.domNode.setClassName('diff-review monaco-editor-background');
-
-		this._content = createFastDomNode(document.createElement('div'));
-		this._content.setClassName('diff-review-content');
-		this._content.setAttribute('role', 'code');
-		this.scrollbar = this._register(new DomScrollableElement(this._content.domNode, {}));
-		this.domNode.domNode.appendChild(this.scrollbar.getDomNode());
-
-		this._register(diffEditor.onDidUpdateDiff(() => {
-			if (!this._isVisible) {
-				return;
-			}
-			this._diffs = this._compute();
-			this._render();
-		}));
-		this._register(diffEditor.getModifiedEditor().onDidChangeCursorPosition(() => {
-			if (!this._isVisible) {
-				return;
-			}
-			this._render();
-		}));
-		this._register(dom.addStandardDisposableListener(this.domNode.domNode, 'click', (e) => {
-			e.preventDefault();
-
-			const row = dom.findParentWithClass(e.target, 'diff-review-row');
-			if (row) {
-				this._goToRow(row);
-			}
-		}));
-		this._register(dom.addStandardDisposableListener(this.domNode.domNode, 'keydown', (e) => {
-			if (
-				e.equals(KeyCode.DownArrow)
-				|| e.equals(KeyMod.CtrlCmd | KeyCode.DownArrow)
-				|| e.equals(KeyMod.Alt | KeyCode.DownArrow)
-			) {
-				e.preventDefault();
-				this._goToRow(this._getNextRow(), 'next');
-			}
-
-			if (
-				e.equals(KeyCode.UpArrow)
-				|| e.equals(KeyMod.CtrlCmd | KeyCode.UpArrow)
-				|| e.equals(KeyMod.Alt | KeyCode.UpArrow)
-			) {
-				e.preventDefault();
-				this._goToRow(this._getPrevRow(), 'previous');
-			}
-
-			if (
-				e.equals(KeyCode.Escape)
-				|| e.equals(KeyMod.CtrlCmd | KeyCode.Escape)
-				|| e.equals(KeyMod.Alt | KeyCode.Escape)
-				|| e.equals(KeyMod.Shift | KeyCode.Escape)
-				|| e.equals(KeyCode.Space)
-				|| e.equals(KeyCode.Enter)
-			) {
-				e.preventDefault();
-				this.accept();
-			}
-		}));
-		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('accessibility.verbosity.diffEditor')) {
-				this._diffEditor.updateOptions({ accessibilityVerbose: this._configurationService.getValue('accessibility.verbosity.diffEditor') });
-			}
-		}));
-		this._diffs = [];
-		this._currentDiff = null;
-	}
-
-	public prev(): void {
-		let index = 0;
-
-		if (!this._isVisible) {
-			this._diffs = this._compute();
-		}
-
-		if (this._isVisible) {
-			let currentIndex = -1;
-			for (let i = 0, len = this._diffs.length; i < len; i++) {
-				if (this._diffs[i] === this._currentDiff) {
-					currentIndex = i;
-					break;
-				}
-			}
-			index = (this._diffs.length + currentIndex - 1);
-		} else {
-			index = this._findDiffIndex(this._diffEditor.getPosition()!);
-		}
-
-		if (this._diffs.length === 0) {
-			// Nothing to do
-			return;
-		}
-
-		index = index % this._diffs.length;
-		const entries = this._diffs[index].entries;
-		this._diffEditor.setPosition(new Position(entries[0].modifiedLineStart, 1));
-		this._diffEditor.setSelection({ startColumn: 1, startLineNumber: entries[0].modifiedLineStart, endColumn: Constants.MAX_SAFE_SMALL_INTEGER, endLineNumber: entries[entries.length - 1].modifiedLineEnd });
-		this._isVisible = true;
-		this._diffEditor.doLayout();
-		this._render();
-		this._goToRow(this._getPrevRow(), 'previous');
-	}
-
-	public next(): void {
-		let index = 0;
-
-		if (!this._isVisible) {
-			this._diffs = this._compute();
-		}
-
-		if (this._isVisible) {
-			let currentIndex = -1;
-			for (let i = 0, len = this._diffs.length; i < len; i++) {
-				if (this._diffs[i] === this._currentDiff) {
-					currentIndex = i;
-					break;
-				}
-			}
-			index = (currentIndex + 1);
-		} else {
-			index = this._findDiffIndex(this._diffEditor.getPosition()!);
-		}
-
-		if (this._diffs.length === 0) {
-			// Nothing to do
-			return;
-		}
-
-		index = index % this._diffs.length;
-		const entries = this._diffs[index].entries;
-		this._diffEditor.setPosition(new Position(entries[0].modifiedLineStart, 1));
-		this._diffEditor.setSelection({ startColumn: 1, startLineNumber: entries[0].modifiedLineStart, endColumn: Constants.MAX_SAFE_SMALL_INTEGER, endLineNumber: entries[entries.length - 1].modifiedLineEnd });
-		this._isVisible = true;
-		this._diffEditor.doLayout();
-		this._render();
-		this._goToRow(this._getNextRow(), 'next');
-	}
-
-	private accept(): void {
-		let jumpToLineNumber = -1;
-		const current = this._getCurrentFocusedRow();
-		if (current) {
-			const lineNumber = parseInt(current.getAttribute('data-line')!, 10);
-			if (!isNaN(lineNumber)) {
-				jumpToLineNumber = lineNumber;
-			}
-		}
-		this.hide();
-
-		if (jumpToLineNumber !== -1) {
-			this._diffEditor.setPosition(new Position(jumpToLineNumber, 1));
-			this._diffEditor.revealPosition(new Position(jumpToLineNumber, 1), ScrollType.Immediate);
-		}
-	}
-
-	private hide(): void {
-		this._isVisible = false;
-		this._diffEditor.updateOptions({ readOnly: false });
-		this._diffEditor.focus();
-		this._diffEditor.doLayout();
-		this._render();
-	}
-
-	private _getPrevRow(): HTMLElement {
-		const current = this._getCurrentFocusedRow();
-		if (!current) {
-			return this._getFirstRow();
-		}
-		if (current.previousElementSibling) {
-			return <HTMLElement>current.previousElementSibling;
-		}
-		return current;
-	}
-
-	private _getNextRow(): HTMLElement {
-		const current = this._getCurrentFocusedRow();
-		if (!current) {
-			return this._getFirstRow();
-		}
-		if (current.nextElementSibling) {
-			return <HTMLElement>current.nextElementSibling;
-		}
-		return current;
-	}
-
-	private _getFirstRow(): HTMLElement {
-		return <HTMLElement>this.domNode.domNode.querySelector('.diff-review-row');
-	}
-
-	private _getCurrentFocusedRow(): HTMLElement | null {
-		const result = <HTMLElement>document.activeElement;
-		if (result && /diff-review-row/.test(result.className)) {
-			return result;
-		}
-		return null;
-	}
-
-	private _goToRow(row: HTMLElement, type?: 'next' | 'previous'): void {
-		const current = this._getCurrentFocusedRow();
-		row.tabIndex = 0;
-		row.focus();
-		if (current && current !== row) {
-			current.tabIndex = -1;
-		}
-		const element = !type ? current : type === 'next' ? current?.nextElementSibling : current?.previousElementSibling;
-		if (element?.classList.contains(DiffEditorLineClasses.Insert)) {
-			this._audioCueService.playAudioCue(AudioCue.diffLineInserted, { allowManyInParallel: true });
-		} else if (element?.classList.contains(DiffEditorLineClasses.Delete)) {
-			this._audioCueService.playAudioCue(AudioCue.diffLineDeleted, { allowManyInParallel: true });
-		}
-		this.scrollbar.scanDomNode();
-	}
-
-	public isVisible(): boolean {
-		return this._isVisible;
-	}
-
-	private _width: number = 0;
-
-	public layout(top: number, width: number, height: number): void {
-		this._width = width;
-		this.shadow.setTop(top - 6);
-		this.shadow.setWidth(width);
-		this.shadow.setHeight(this._isVisible ? 6 : 0);
-		this.domNode.setTop(top);
-		this.domNode.setWidth(width);
-		this.domNode.setHeight(height);
-		this._content.setHeight(height);
-		this._content.setWidth(width);
-
-		if (this._isVisible) {
-			this.actionBarContainer.setAttribute('aria-hidden', 'false');
-			this.actionBarContainer.setDisplay('block');
-		} else {
-			this.actionBarContainer.setAttribute('aria-hidden', 'true');
-			this.actionBarContainer.setDisplay('none');
-		}
-	}
-
-	private _compute(): Diff[] {
-		const lineChanges = this._diffEditor.getLineChanges();
-		if (!lineChanges || lineChanges.length === 0) {
-			return [];
-		}
-		const originalModel = this._diffEditor.getOriginalEditor().getModel();
-		const modifiedModel = this._diffEditor.getModifiedEditor().getModel();
-
-		if (!originalModel || !modifiedModel) {
-			return [];
-		}
-
-		return DiffReview._mergeAdjacent(lineChanges, originalModel.getLineCount(), modifiedModel.getLineCount());
-	}
-
-	private static _mergeAdjacent(lineChanges: ILineChange[], originalLineCount: number, modifiedLineCount: number): Diff[] {
-		if (!lineChanges || lineChanges.length === 0) {
-			return [];
-		}
-
-		const diffs: Diff[] = [];
-		let diffsLength = 0;
-
-		for (let i = 0, len = lineChanges.length; i < len; i++) {
-			const lineChange = lineChanges[i];
-
-			const originalStart = lineChange.originalStartLineNumber;
-			const originalEnd = lineChange.originalEndLineNumber;
-			const modifiedStart = lineChange.modifiedStartLineNumber;
-			const modifiedEnd = lineChange.modifiedEndLineNumber;
-
-			const r: DiffEntry[] = [];
-			let rLength = 0;
-
-			// Emit before anchors
-			{
-				const originalEqualAbove = (originalEnd === 0 ? originalStart : originalStart - 1);
-				const modifiedEqualAbove = (modifiedEnd === 0 ? modifiedStart : modifiedStart - 1);
-
-				// Make sure we don't step into the previous diff
-				let minOriginal = 1;
-				let minModified = 1;
-				if (i > 0) {
-					const prevLineChange = lineChanges[i - 1];
-
-					if (prevLineChange.originalEndLineNumber === 0) {
-						minOriginal = prevLineChange.originalStartLineNumber + 1;
-					} else {
-						minOriginal = prevLineChange.originalEndLineNumber + 1;
-					}
-
-					if (prevLineChange.modifiedEndLineNumber === 0) {
-						minModified = prevLineChange.modifiedStartLineNumber + 1;
-					} else {
-						minModified = prevLineChange.modifiedEndLineNumber + 1;
-					}
-				}
-
-				let fromOriginal = originalEqualAbove - DIFF_LINES_PADDING + 1;
-				let fromModified = modifiedEqualAbove - DIFF_LINES_PADDING + 1;
-				if (fromOriginal < minOriginal) {
-					const delta = minOriginal - fromOriginal;
-					fromOriginal = fromOriginal + delta;
-					fromModified = fromModified + delta;
-				}
-				if (fromModified < minModified) {
-					const delta = minModified - fromModified;
-					fromOriginal = fromOriginal + delta;
-					fromModified = fromModified + delta;
-				}
-
-				r[rLength++] = new DiffEntry(
-					fromOriginal, originalEqualAbove,
-					fromModified, modifiedEqualAbove
-				);
-			}
-
-			// Emit deleted lines
-			{
-				if (originalEnd !== 0) {
-					r[rLength++] = new DiffEntry(originalStart, originalEnd, 0, 0);
-				}
-			}
-
-			// Emit inserted lines
-			{
-				if (modifiedEnd !== 0) {
-					r[rLength++] = new DiffEntry(0, 0, modifiedStart, modifiedEnd);
-				}
-			}
-
-			// Emit after anchors
-			{
-				const originalEqualBelow = (originalEnd === 0 ? originalStart + 1 : originalEnd + 1);
-				const modifiedEqualBelow = (modifiedEnd === 0 ? modifiedStart + 1 : modifiedEnd + 1);
-
-				// Make sure we don't step into the next diff
-				let maxOriginal = originalLineCount;
-				let maxModified = modifiedLineCount;
-				if (i + 1 < len) {
-					const nextLineChange = lineChanges[i + 1];
-
-					if (nextLineChange.originalEndLineNumber === 0) {
-						maxOriginal = nextLineChange.originalStartLineNumber;
-					} else {
-						maxOriginal = nextLineChange.originalStartLineNumber - 1;
-					}
-
-					if (nextLineChange.modifiedEndLineNumber === 0) {
-						maxModified = nextLineChange.modifiedStartLineNumber;
-					} else {
-						maxModified = nextLineChange.modifiedStartLineNumber - 1;
-					}
-				}
-
-				let toOriginal = originalEqualBelow + DIFF_LINES_PADDING - 1;
-				let toModified = modifiedEqualBelow + DIFF_LINES_PADDING - 1;
-
-				if (toOriginal > maxOriginal) {
-					const delta = maxOriginal - toOriginal;
-					toOriginal = toOriginal + delta;
-					toModified = toModified + delta;
-				}
-				if (toModified > maxModified) {
-					const delta = maxModified - toModified;
-					toOriginal = toOriginal + delta;
-					toModified = toModified + delta;
-				}
-
-				r[rLength++] = new DiffEntry(
-					originalEqualBelow, toOriginal,
-					modifiedEqualBelow, toModified,
-				);
-			}
-
-			diffs[diffsLength++] = new Diff(r);
-		}
-
-		// Merge adjacent diffs
-		let curr: DiffEntry[] = diffs[0].entries;
-		const r: Diff[] = [];
-		let rLength = 0;
-		for (let i = 1, len = diffs.length; i < len; i++) {
-			const thisDiff = diffs[i].entries;
-
-			const currLast = curr[curr.length - 1];
-			const thisFirst = thisDiff[0];
-
-			if (
-				currLast.getType() === DiffEntryType.Equal
-				&& thisFirst.getType() === DiffEntryType.Equal
-				&& thisFirst.originalLineStart <= currLast.originalLineEnd
-			) {
-				// We are dealing with equal lines that overlap
-
-				curr[curr.length - 1] = new DiffEntry(
-					currLast.originalLineStart, thisFirst.originalLineEnd,
-					currLast.modifiedLineStart, thisFirst.modifiedLineEnd
-				);
-				curr = curr.concat(thisDiff.slice(1));
-				continue;
-			}
-
-			r[rLength++] = new Diff(curr);
-			curr = thisDiff;
-		}
-		r[rLength++] = new Diff(curr);
-		return r;
-	}
-
-	private _findDiffIndex(pos: Position): number {
-		const lineNumber = pos.lineNumber;
-		for (let i = 0, len = this._diffs.length; i < len; i++) {
-			const diff = this._diffs[i].entries;
-			const lastModifiedLine = diff[diff.length - 1].modifiedLineEnd;
-			if (lineNumber <= lastModifiedLine) {
-				return i;
-			}
-		}
-		return 0;
-	}
-
-	private _render(): void {
-
-		const originalOptions = this._diffEditor.getOriginalEditor().getOptions();
-		const modifiedOptions = this._diffEditor.getModifiedEditor().getOptions();
-
-		const originalModel = this._diffEditor.getOriginalEditor().getModel();
-		const modifiedModel = this._diffEditor.getModifiedEditor().getModel();
-
-		const originalModelOpts = originalModel!.getOptions();
-		const modifiedModelOpts = modifiedModel!.getOptions();
-
-		if (!this._isVisible || !originalModel || !modifiedModel) {
-			dom.clearNode(this._content.domNode);
-			this._currentDiff = null;
-			this.scrollbar.scanDomNode();
-			return;
-		}
-
-		this._diffEditor.updateOptions({ readOnly: true });
-		const diffIndex = this._findDiffIndex(this._diffEditor.getPosition()!);
-
-		if (this._diffs[diffIndex] === this._currentDiff) {
-			return;
-		}
-		this._currentDiff = this._diffs[diffIndex];
-
-		const diffs = this._diffs[diffIndex].entries;
-		const container = document.createElement('div');
-		container.className = 'diff-review-table';
-		container.setAttribute('role', 'list');
-		container.setAttribute('aria-label', 'Difference review. Use "Stage | Unstage | Revert Selected Ranges" commands');
-		applyFontInfo(container, modifiedOptions.get(EditorOption.fontInfo));
-
-		let minOriginalLine = 0;
-		let maxOriginalLine = 0;
-		let minModifiedLine = 0;
-		let maxModifiedLine = 0;
-		for (let i = 0, len = diffs.length; i < len; i++) {
-			const diffEntry = diffs[i];
-			const originalLineStart = diffEntry.originalLineStart;
-			const originalLineEnd = diffEntry.originalLineEnd;
-			const modifiedLineStart = diffEntry.modifiedLineStart;
-			const modifiedLineEnd = diffEntry.modifiedLineEnd;
-
-			if (originalLineStart !== 0 && ((minOriginalLine === 0 || originalLineStart < minOriginalLine))) {
-				minOriginalLine = originalLineStart;
-			}
-			if (originalLineEnd !== 0 && ((maxOriginalLine === 0 || originalLineEnd > maxOriginalLine))) {
-				maxOriginalLine = originalLineEnd;
-			}
-			if (modifiedLineStart !== 0 && ((minModifiedLine === 0 || modifiedLineStart < minModifiedLine))) {
-				minModifiedLine = modifiedLineStart;
-			}
-			if (modifiedLineEnd !== 0 && ((maxModifiedLine === 0 || modifiedLineEnd > maxModifiedLine))) {
-				maxModifiedLine = modifiedLineEnd;
-			}
-		}
-
-		const header = document.createElement('div');
-		header.className = 'diff-review-row';
-
-		const cell = document.createElement('div');
-		cell.className = 'diff-review-cell diff-review-summary';
-		const originalChangedLinesCnt = maxOriginalLine - minOriginalLine + 1;
-		const modifiedChangedLinesCnt = maxModifiedLine - minModifiedLine + 1;
-		cell.appendChild(document.createTextNode(`${diffIndex + 1}/${this._diffs.length}: @@ -${minOriginalLine},${originalChangedLinesCnt} +${minModifiedLine},${modifiedChangedLinesCnt} @@`));
-		header.setAttribute('data-line', String(minModifiedLine));
-
-		const getAriaLines = (lines: number) => {
-			if (lines === 0) {
-				return nls.localize('no_lines_changed', "no lines changed");
-			} else if (lines === 1) {
-				return nls.localize('one_line_changed', "1 line changed");
-			} else {
-				return nls.localize('more_lines_changed', "{0} lines changed", lines);
-			}
-		};
-
-		const originalChangedLinesCntAria = getAriaLines(originalChangedLinesCnt);
-		const modifiedChangedLinesCntAria = getAriaLines(modifiedChangedLinesCnt);
-		header.setAttribute('aria-label', nls.localize({
-			key: 'header',
-			comment: [
-				'This is the ARIA label for a git diff header.',
-				'A git diff header looks like this: @@ -154,12 +159,39 @@.',
-				'That encodes that at original line 154 (which is now line 159), 12 lines were removed/changed with 39 lines.',
-				'Variables 0 and 1 refer to the diff index out of total number of diffs.',
-				'Variables 2 and 4 will be numbers (a line number).',
-				'Variables 3 and 5 will be "no lines changed", "1 line changed" or "X lines changed", localized separately.'
-			]
-		}, "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}", (diffIndex + 1), this._diffs.length, minOriginalLine, originalChangedLinesCntAria, minModifiedLine, modifiedChangedLinesCntAria));
-		header.appendChild(cell);
-
-		// @@ -504,7 +517,7 @@
-		header.setAttribute('role', 'listitem');
-		container.appendChild(header);
-
-		const lineHeight = modifiedOptions.get(EditorOption.lineHeight);
-		let modLine = minModifiedLine;
-		for (let i = 0, len = diffs.length; i < len; i++) {
-			const diffEntry = diffs[i];
-			DiffReview._renderSection(container, diffEntry, modLine, lineHeight, this._width, originalOptions, originalModel, originalModelOpts, modifiedOptions, modifiedModel, modifiedModelOpts, this._languageService.languageIdCodec);
-			if (diffEntry.modifiedLineStart !== 0) {
-				modLine = diffEntry.modifiedLineEnd;
-			}
-		}
-
-		dom.clearNode(this._content.domNode);
-		this._content.domNode.appendChild(container);
-		this.scrollbar.scanDomNode();
-	}
-
-	private static _renderSection(
-		dest: HTMLElement, diffEntry: DiffEntry, modLine: number, lineHeight: number, width: number,
-		originalOptions: IComputedEditorOptions, originalModel: ITextModel, originalModelOpts: TextModelResolvedOptions,
-		modifiedOptions: IComputedEditorOptions, modifiedModel: ITextModel, modifiedModelOpts: TextModelResolvedOptions,
-		languageIdCodec: ILanguageIdCodec
-	): void {
-
-		const type = diffEntry.getType();
-
-		let rowClassName: string = 'diff-review-row';
-		let lineNumbersExtraClassName: string = '';
-		const spacerClassName: string = 'diff-review-spacer';
-		let spacerIcon: ThemeIcon | null = null;
-		switch (type) {
-			case DiffEntryType.Insert:
-				rowClassName = 'diff-review-row line-insert';
-				lineNumbersExtraClassName = ' char-insert';
-				spacerIcon = diffReviewInsertIcon;
-				break;
-			case DiffEntryType.Delete:
-				rowClassName = 'diff-review-row line-delete';
-				lineNumbersExtraClassName = ' char-delete';
-				spacerIcon = diffReviewRemoveIcon;
-				break;
-		}
-
-		const originalLineStart = diffEntry.originalLineStart;
-		const originalLineEnd = diffEntry.originalLineEnd;
-		const modifiedLineStart = diffEntry.modifiedLineStart;
-		const modifiedLineEnd = diffEntry.modifiedLineEnd;
-
-		const cnt = Math.max(
-			modifiedLineEnd - modifiedLineStart,
-			originalLineEnd - originalLineStart
-		);
-
-		const originalLayoutInfo = originalOptions.get(EditorOption.layoutInfo);
-		const originalLineNumbersWidth = originalLayoutInfo.glyphMarginWidth + originalLayoutInfo.lineNumbersWidth;
-
-		const modifiedLayoutInfo = modifiedOptions.get(EditorOption.layoutInfo);
-		const modifiedLineNumbersWidth = 10 + modifiedLayoutInfo.glyphMarginWidth + modifiedLayoutInfo.lineNumbersWidth;
-
-		for (let i = 0; i <= cnt; i++) {
-			const originalLine = (originalLineStart === 0 ? 0 : originalLineStart + i);
-			const modifiedLine = (modifiedLineStart === 0 ? 0 : modifiedLineStart + i);
-
-			const row = document.createElement('div');
-			row.style.minWidth = width + 'px';
-			row.className = rowClassName;
-			row.setAttribute('role', 'listitem');
-			if (modifiedLine !== 0) {
-				modLine = modifiedLine;
-			}
-			row.setAttribute('data-line', String(modLine));
-
-			const cell = document.createElement('div');
-			cell.className = 'diff-review-cell';
-			cell.style.height = `${lineHeight}px`;
-			row.appendChild(cell);
-
-			const originalLineNumber = document.createElement('span');
-			originalLineNumber.style.width = (originalLineNumbersWidth + 'px');
-			originalLineNumber.style.minWidth = (originalLineNumbersWidth + 'px');
-			originalLineNumber.className = 'diff-review-line-number' + lineNumbersExtraClassName;
-			if (originalLine !== 0) {
-				originalLineNumber.appendChild(document.createTextNode(String(originalLine)));
-			} else {
-				originalLineNumber.innerText = '\u00a0';
-			}
-			cell.appendChild(originalLineNumber);
-
-			const modifiedLineNumber = document.createElement('span');
-			modifiedLineNumber.style.width = (modifiedLineNumbersWidth + 'px');
-			modifiedLineNumber.style.minWidth = (modifiedLineNumbersWidth + 'px');
-			modifiedLineNumber.style.paddingRight = '10px';
-			modifiedLineNumber.className = 'diff-review-line-number' + lineNumbersExtraClassName;
-			if (modifiedLine !== 0) {
-				modifiedLineNumber.appendChild(document.createTextNode(String(modifiedLine)));
-			} else {
-				modifiedLineNumber.innerText = '\u00a0';
-			}
-			cell.appendChild(modifiedLineNumber);
-
-			const spacer = document.createElement('span');
-			spacer.className = spacerClassName;
-
-			if (spacerIcon) {
-				const spacerCodicon = document.createElement('span');
-				spacerCodicon.className = ThemeIcon.asClassName(spacerIcon);
-				spacerCodicon.innerText = '\u00a0\u00a0';
-				spacer.appendChild(spacerCodicon);
-			} else {
-				spacer.innerText = '\u00a0\u00a0';
-			}
-			cell.appendChild(spacer);
-
-			let lineContent: string;
-			if (modifiedLine !== 0) {
-				let html: string | TrustedHTML = this._renderLine(modifiedModel, modifiedOptions, modifiedModelOpts.tabSize, modifiedLine, languageIdCodec);
-				if (DiffReview._ttPolicy) {
-					html = DiffReview._ttPolicy.createHTML(html as string);
-				}
-				cell.insertAdjacentHTML('beforeend', html as string);
-				lineContent = modifiedModel.getLineContent(modifiedLine);
-			} else {
-				let html: string | TrustedHTML = this._renderLine(originalModel, originalOptions, originalModelOpts.tabSize, originalLine, languageIdCodec);
-				if (DiffReview._ttPolicy) {
-					html = DiffReview._ttPolicy.createHTML(html as string);
-				}
-				cell.insertAdjacentHTML('beforeend', html as string);
-				lineContent = originalModel.getLineContent(originalLine);
-			}
-
-			if (lineContent.length === 0) {
-				lineContent = nls.localize('blankLine', "blank");
-			}
-
-			let ariaLabel: string = '';
-			switch (type) {
-				case DiffEntryType.Equal:
-					if (originalLine === modifiedLine) {
-						ariaLabel = nls.localize({ key: 'unchangedLine', comment: ['The placeholders are contents of the line and should not be translated.'] }, "{0} unchanged line {1}", lineContent, originalLine);
-					} else {
-						ariaLabel = nls.localize('equalLine', "{0} original line {1} modified line {2}", lineContent, originalLine, modifiedLine);
-					}
-					break;
-				case DiffEntryType.Insert:
-					ariaLabel = nls.localize('insertLine', "+ {0} modified line {1}", lineContent, modifiedLine);
-					break;
-				case DiffEntryType.Delete:
-					ariaLabel = nls.localize('deleteLine', "- {0} original line {1}", lineContent, originalLine);
-					break;
-			}
-			row.setAttribute('aria-label', ariaLabel);
-
-			dest.appendChild(row);
-		}
-	}
-
-	private static _renderLine(model: ITextModel, options: IComputedEditorOptions, tabSize: number, lineNumber: number, languageIdCodec: ILanguageIdCodec): string {
-		const lineContent = model.getLineContent(lineNumber);
-		const fontInfo = options.get(EditorOption.fontInfo);
-		const lineTokens = LineTokens.createEmpty(lineContent, languageIdCodec);
-		const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, model.mightContainNonBasicASCII());
-		const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, model.mightContainRTL());
-		const r = renderViewLine(new RenderLineInput(
-			(fontInfo.isMonospace && !options.get(EditorOption.disableMonospaceOptimizations)),
-			fontInfo.canUseHalfwidthRightwardsArrow,
-			lineContent,
-			false,
-			isBasicASCII,
-			containsRTL,
-			0,
-			lineTokens,
-			[],
-			tabSize,
-			0,
-			fontInfo.spaceWidth,
-			fontInfo.middotWidth,
-			fontInfo.wsmiddotWidth,
-			options.get(EditorOption.stopRenderingLineAfter),
-			options.get(EditorOption.renderWhitespace),
-			options.get(EditorOption.renderControlCharacters),
-			options.get(EditorOption.fontLigatures) !== EditorFontLigatures.OFF,
-			null
-		));
-
-		return r.html;
-	}
-}
-
-// theming
--- a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
@@ -7,21 +7,18 @@ import * as objects from 'vs/base/common/objects';
 import { ICodeEditor, IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
-import { DiffEditorWidget, IDiffCodeEditorWidgetOptions } from 'vs/editor/browser/widget/diffEditorWidget';
+import { DiffEditorWidget2, IDiffCodeEditorWidgetOptions } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';
 import { ConfigurationChangedEvent, IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { IAudioCueService } from 'vs/platform/audioCues/browser/audioCueService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IEditorProgressService } from 'vs/platform/progress/common/progress';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { DiffEditorWidget2 } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';
-import { IAudioCueService } from 'vs/platform/audioCues/browser/audioCueService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';

 export class EmbeddedCodeEditorWidget extends CodeEditorWidget {

@@ -69,54 +66,6 @@ export class EmbeddedCodeEditorWidget extends CodeEditorWidget {
 	}
 }

-/**
- * @deprecated Use EmbeddedDiffEditorWidget2 instead.
- */
-export class EmbeddedDiffEditorWidget extends DiffEditorWidget {
-
-	private readonly _parentEditor: ICodeEditor;
-	private readonly _overwriteOptions: IDiffEditorOptions;
-
-	constructor(
-		domElement: HTMLElement,
-		options: Readonly<IDiffEditorConstructionOptions>,
-		codeEditorWidgetOptions: IDiffCodeEditorWidgetOptions,
-		parentEditor: ICodeEditor,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@ICodeEditorService codeEditorService: ICodeEditorService,
-		@IThemeService themeService: IThemeService,
-		@INotificationService notificationService: INotificationService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IClipboardService clipboardService: IClipboardService,
-		@IEditorProgressService editorProgressService: IEditorProgressService,
-	) {
-		super(domElement, parentEditor.getRawOptions(), codeEditorWidgetOptions, clipboardService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService, contextMenuService, editorProgressService);
-
-		this._parentEditor = parentEditor;
-		this._overwriteOptions = options;
-
-		// Overwrite parent's options
-		super.updateOptions(this._overwriteOptions);
-
-		this._register(parentEditor.onDidChangeConfiguration(e => this._onParentConfigurationChanged(e)));
-	}
-
-	getParentEditor(): ICodeEditor {
-		return this._parentEditor;
-	}
-
-	private _onParentConfigurationChanged(e: ConfigurationChangedEvent): void {
-		super.updateOptions(this._parentEditor.getRawOptions());
-		super.updateOptions(this._overwriteOptions);
-	}
-
-	override updateOptions(newOptions: IEditorOptions): void {
-		objects.mixin(this._overwriteOptions, newOptions, true);
-		super.updateOptions(this._overwriteOptions);
-	}
-}
-
 /**
 * TODO: Rename to EmbeddedDiffEditorWidget once EmbeddedDiffEditorWidget is removed.
 */
--- a/src/vs/editor/common/config/editorConfigurationSchema.ts
+++ b/src/vs/editor/common/config/editorConfigurationSchema.ts
@@ -217,36 +217,30 @@ const editorConfiguration: IConfigurationNode = {
 		'diffEditor.hideUnchangedRegions.enabled': {
 			type: 'boolean',
 			default: diffEditorDefaultOptions.hideUnchangedRegions.enabled,
-			markdownDescription: nls.localize('hideUnchangedRegions.enabled', "Controls whether the diff editor shows unchanged regions. Only works when {0} is set.", '`#diffEditor.experimental.useVersion2#`'),
+			markdownDescription: nls.localize('hideUnchangedRegions.enabled', "Controls whether the diff editor shows unchanged regions."),
 		},
 		'diffEditor.hideUnchangedRegions.revealLineCount': {
 			type: 'integer',
 			default: diffEditorDefaultOptions.hideUnchangedRegions.revealLineCount,
-			markdownDescription: nls.localize('hideUnchangedRegions.revealLineCount', "Controls how many lines are used for unchanged regions. Only works when {0} is set.", '`#diffEditor.experimental.useVersion2#`'),
+			markdownDescription: nls.localize('hideUnchangedRegions.revealLineCount', "Controls how many lines are used for unchanged regions."),
 			minimum: 1,
 		},
 		'diffEditor.hideUnchangedRegions.minimumLineCount': {
 			type: 'integer',
 			default: diffEditorDefaultOptions.hideUnchangedRegions.minimumLineCount,
-			markdownDescription: nls.localize('hideUnchangedRegions.minimumLineCount', "Controls how many lines are used as a minimum for unchanged regions. Only works when {0} is set.", '`#diffEditor.experimental.useVersion2#`'),
+			markdownDescription: nls.localize('hideUnchangedRegions.minimumLineCount', "Controls how many lines are used as a minimum for unchanged regions."),
 			minimum: 1,
 		},
 		'diffEditor.hideUnchangedRegions.contextLineCount': {
 			type: 'integer',
 			default: diffEditorDefaultOptions.hideUnchangedRegions.contextLineCount,
-			markdownDescription: nls.localize('hideUnchangedRegions.contextLineCount', "Controls how many lines are used as context when comparing unchanged regions. Only works when {0} is set.", '`#diffEditor.experimental.useVersion2#`'),
+			markdownDescription: nls.localize('hideUnchangedRegions.contextLineCount', "Controls how many lines are used as context when comparing unchanged regions."),
 			minimum: 1,
 		},
 		'diffEditor.experimental.showMoves': {
 			type: 'boolean',
 			default: diffEditorDefaultOptions.experimental.showMoves,
-			markdownDescription: nls.localize('showMoves', "Controls whether the diff editor should show detected code moves. Only works when {0} is set.", '`#diffEditor.experimental.useVersion2#`')
-		},
-		'diffEditor.experimental.useVersion2': {
-			type: 'boolean',
-			default: true,
-			description: nls.localize('useVersion2', "Controls whether the diff editor uses the new or the old implementation."),
-			tags: ['experimental'],
+			markdownDescription: nls.localize('showMoves', "Controls whether the diff editor should show detected code moves.")
 		},
 		'diffEditor.experimental.showEmptyDecorations': {
 			type: 'boolean',
--- a/src/vs/editor/editor.all.ts
+++ b/src/vs/editor/editor.all.ts
@@ -5,8 +5,7 @@

 import 'vs/editor/browser/coreCommands';
 import 'vs/editor/browser/widget/codeEditorWidget';
-import 'vs/editor/browser/widget/diffEditorWidget';
-import 'vs/editor/browser/widget/diffNavigator';
+import 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';
 import 'vs/editor/contrib/anchorSelect/browser/anchorSelect';
 import 'vs/editor/contrib/bracketMatching/browser/bracketMatching';
 import 'vs/editor/contrib/caretOperations/browser/caretOperations';
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -8,7 +8,6 @@ import { Disposable, IDisposable, toDisposable, DisposableStore } from 'vs/base/
 import { ICodeEditor, IDiffEditor, IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
 import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { InternalEditorAction } from 'vs/editor/common/editorAction';
 import { IModelChangedEvent } from 'vs/editor/common/editorCommon';
@@ -481,82 +480,6 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 	}
 }

-export class StandaloneDiffEditor extends DiffEditorWidget implements IStandaloneDiffEditor {
-
-	private readonly _configurationService: IConfigurationService;
-	private readonly _standaloneThemeService: IStandaloneThemeService;
-
-	constructor(
-		domElement: HTMLElement,
-		_options: Readonly<IStandaloneDiffEditorConstructionOptions> | undefined,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@ICodeEditorService codeEditorService: ICodeEditorService,
-		@IStandaloneThemeService themeService: IStandaloneThemeService,
-		@INotificationService notificationService: INotificationService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IEditorProgressService editorProgressService: IEditorProgressService,
-		@IClipboardService clipboardService: IClipboardService
-	) {
-		const options = { ..._options };
-		updateConfigurationService(configurationService, options, true);
-		const themeDomRegistration = (<StandaloneThemeService>themeService).registerEditorContainer(domElement);
-		if (typeof options.theme === 'string') {
-			themeService.setTheme(options.theme);
-		}
-		if (typeof options.autoDetectHighContrast !== 'undefined') {
-			themeService.setAutoDetectHighContrast(Boolean(options.autoDetectHighContrast));
-		}
-
-		super(domElement, options, {}, clipboardService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService, contextMenuService, editorProgressService);
-
-		this._configurationService = configurationService;
-		this._standaloneThemeService = themeService;
-
-		this._register(themeDomRegistration);
-	}
-
-	public override dispose(): void {
-		super.dispose();
-	}
-
-	public override updateOptions(newOptions: Readonly<IDiffEditorOptions & IGlobalEditorOptions>): void {
-		updateConfigurationService(this._configurationService, newOptions, true);
-		if (typeof newOptions.theme === 'string') {
-			this._standaloneThemeService.setTheme(newOptions.theme);
-		}
-		if (typeof newOptions.autoDetectHighContrast !== 'undefined') {
-			this._standaloneThemeService.setAutoDetectHighContrast(Boolean(newOptions.autoDetectHighContrast));
-		}
-		super.updateOptions(newOptions);
-	}
-
-	protected override _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: Readonly<IEditorOptions>): CodeEditorWidget {
-		return instantiationService.createInstance(StandaloneCodeEditor, container, options);
-	}
-
-	public override getOriginalEditor(): IStandaloneCodeEditor {
-		return <StandaloneCodeEditor>super.getOriginalEditor();
-	}
-
-	public override getModifiedEditor(): IStandaloneCodeEditor {
-		return <StandaloneCodeEditor>super.getModifiedEditor();
-	}
-
-	public addCommand(keybinding: number, handler: ICommandHandler, context?: string): string | null {
-		return this.getModifiedEditor().addCommand(keybinding, handler, context);
-	}
-
-	public createContextKey<T extends ContextKeyValue = ContextKeyValue>(key: string, defaultValue: T): IContextKey<T> {
-		return this.getModifiedEditor().createContextKey(key, defaultValue);
-	}
-
-	public addAction(descriptor: IActionDescriptor): IDisposable {
-		return this.getModifiedEditor().addAction(descriptor);
-	}
-}
-
 export class StandaloneDiffEditor2 extends DiffEditorWidget2 implements IStandaloneDiffEditor {

 	private readonly _configurationService: IConfigurationService;
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -12,7 +12,6 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IWebWorkerOptions, MonacoWebWorker, createWebWorker as actualCreateWebWorker } from 'vs/editor/browser/services/webWorker';
-import { DiffNavigator, IDiffNavigator } from 'vs/editor/browser/widget/diffNavigator';
 import { ApplyUpdateResult, ConfigurationChangedEvent, EditorOptions } from 'vs/editor/common/config/editorOptions';
 import { EditorZoom } from 'vs/editor/common/config/editorZoom';
 import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
@@ -28,7 +27,7 @@ import { FindMatch, ITextModel, TextModelResolvedOptions } from 'vs/editor/commo
 import { IModelService } from 'vs/editor/common/services/model';
 import * as standaloneEnums from 'vs/editor/common/standalone/standaloneEnums';
 import { Colorizer, IColorizerElementOptions, IColorizerOptions } from 'vs/editor/standalone/browser/colorizer';
-import { IActionDescriptor, IStandaloneCodeEditor, IStandaloneDiffEditor, IStandaloneDiffEditorConstructionOptions, IStandaloneEditorConstructionOptions, StandaloneDiffEditor, StandaloneDiffEditor2, StandaloneEditor, createTextModel } from 'vs/editor/standalone/browser/standaloneCodeEditor';
+import { IActionDescriptor, IStandaloneCodeEditor, IStandaloneDiffEditor, IStandaloneDiffEditorConstructionOptions, IStandaloneEditorConstructionOptions, StandaloneDiffEditor2, StandaloneEditor, createTextModel } from 'vs/editor/standalone/browser/standaloneCodeEditor';
 import { IEditorOverrideServices, StandaloneKeybindingService, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices';
 import { StandaloneThemeService } from 'vs/editor/standalone/browser/standaloneThemeService';
 import { IStandaloneThemeData, IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneTheme';
@@ -96,21 +95,7 @@ export function getDiffEditors(): readonly IDiffEditor[] {
 */
 export function createDiffEditor(domElement: HTMLElement, options?: IStandaloneDiffEditorConstructionOptions, override?: IEditorOverrideServices): IStandaloneDiffEditor {
 	const instantiationService = StandaloneServices.initialize(override || {});
-	if ((options?.experimental as any)?.useVersion2) {
-		return instantiationService.createInstance(StandaloneDiffEditor2, domElement, options);
-	}
-	return instantiationService.createInstance(StandaloneDiffEditor, domElement, options);
-}
-
-export interface IDiffNavigatorOptions {
-	readonly followsCaret?: boolean;
-	readonly ignoreCharChanges?: boolean;
-	readonly alwaysRevealFirst?: boolean;
-}
-
-export function createDiffNavigator(diffEditor: IStandaloneDiffEditor, opts?: IDiffNavigatorOptions): IDiffNavigator {
-	const instantiationService = StandaloneServices.initialize({});
-	return instantiationService.createInstance(DiffNavigator, diffEditor, opts);
+	return instantiationService.createInstance(StandaloneDiffEditor2, domElement, options);
 }

 /**
@@ -516,7 +501,6 @@ export function createMonacoEditorAPI(): typeof monaco.editor {
 		onDidCreateEditor: <any>onDidCreateEditor,
 		onDidCreateDiffEditor: <any>onDidCreateDiffEditor,
 		createDiffEditor: <any>createDiffEditor,
-		createDiffNavigator: <any>createDiffNavigator,

 		addCommand: <any>addCommand,
 		addEditorAction: <any>addEditorAction,
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -937,13 +937,6 @@ declare namespace monaco {

 declare namespace monaco.editor {

-	export interface IDiffNavigator {
-		canNavigate(): boolean;
-		next(): void;
-		previous(): void;
-		dispose(): void;
-	}
-
 	/**
 	 * Create a new editor under `domElement`.
 	 * `domElement` should be empty (not contain other dom nodes).
@@ -981,14 +974,6 @@ declare namespace monaco.editor {
 	 */
 	export function createDiffEditor(domElement: HTMLElement, options?: IStandaloneDiffEditorConstructionOptions, override?: IEditorOverrideServices): IStandaloneDiffEditor;

-	export interface IDiffNavigatorOptions {
-		readonly followsCaret?: boolean;
-		readonly ignoreCharChanges?: boolean;
-		readonly alwaysRevealFirst?: boolean;
-	}
-
-	export function createDiffNavigator(diffEditor: IStandaloneDiffEditor, opts?: IDiffNavigatorOptions): IDiffNavigator;
-
 	/**
 	 * Description of a command contribution
 	 */
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -13,7 +13,6 @@ import { TEXT_DIFF_EDITOR_ID, IEditorFactoryRegistry, EditorExtensions, ITextDif
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { applyTextEditorOptions } from 'vs/workbench/common/editor/editorOptions';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
 import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -22,7 +21,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { TextFileOperationError, TextFileOperationResult } from 'vs/workbench/services/textfile/common/textfiles';
 import { ScrollType, IDiffEditorViewState, IDiffEditorModel } from 'vs/editor/common/editorCommon';
-import { DisposableStore } from 'vs/base/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { URI } from 'vs/base/common/uri';
 import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
@@ -43,12 +41,9 @@ import { DiffEditorWidget2 } from 'vs/editor/browser/widget/diffEditorWidget2/di
 */
 export class TextDiffEditor extends AbstractTextEditor<IDiffEditorViewState> implements ITextDiffEditorPane {
 	static readonly ID = TEXT_DIFF_EDITOR_ID;
-	private static widgetCounter = 0; // Just for debugging

 	private diffEditorControl: IDiffEditor | undefined = undefined;

-	private readonly diffNavigatorDisposables = this._register(new DisposableStore());
-
 	private inputLifecycleStopWatch: StopWatch | undefined = undefined;

 	override get scopedContextKeyService(): IContextKeyService | undefined {
@@ -85,18 +80,7 @@ export class TextDiffEditor extends AbstractTextEditor<IDiffEditorViewState> imp
 	}

 	protected override createEditorControl(parent: HTMLElement, configuration: ICodeEditorOptions): void {
-		TextDiffEditor.widgetCounter++;
-		let useVersion2 = this.textResourceConfigurationService.getValue(undefined, 'diffEditor.experimental.useVersion2');
-		if (useVersion2 === 'first') {
-			// This allows to have both the old and new diff editor next to each other - just for debugging
-			useVersion2 = TextDiffEditor.widgetCounter === 1;
-		}
-
-		if (useVersion2) {
-			this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget2, parent, configuration, {}));
-		} else {
-			this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget, parent, configuration, {}));
-		}
+		this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget2, parent, configuration, {}));
 	}

 	protected updateEditorControlOptions(options: ICodeEditorOptions): void {
@@ -111,7 +95,6 @@ export class TextDiffEditor extends AbstractTextEditor<IDiffEditorViewState> imp

 		// Cleanup previous things associated with the input
 		this.inputLifecycleStopWatch = undefined;
-		this.diffNavigatorDisposables.clear();

 		// Set input and resolve
 		await super.setInput(input, options, context, token);
@@ -324,9 +307,6 @@ export class TextDiffEditor extends AbstractTextEditor<IDiffEditorViewState> imp
 			this.logInputLifecycleTelemetry(inputLifecycleElapsed, this.getControl()?.getModel()?.modified?.getLanguageId());
 		}

-		// Dispose previous diff navigator
-		this.diffNavigatorDisposables.clear();
-
 		// Clear Model
 		this.diffEditorControl?.setModel(null);
 	}
--- a/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
@@ -10,7 +10,7 @@ import { registerDiffEditorContribution } from 'vs/editor/browser/editorExtensio
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev } from 'vs/editor/browser/widget/diffEditor.contribution';
 import { DiffEditorWidget2 } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';
-import { EmbeddedDiffEditorWidget, EmbeddedDiffEditorWidget2 } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
+import { EmbeddedDiffEditorWidget2 } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { IDiffEditorContribution } from 'vs/editor/common/editorCommon';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -39,7 +39,7 @@ class DiffEditorHelperContribution extends Disposable implements IDiffEditorCont

 		this._register(createScreenReaderHelp());

-		const isEmbeddedDiffEditor = (this._diffEditor instanceof EmbeddedDiffEditorWidget) || (this._diffEditor instanceof EmbeddedDiffEditorWidget2);
+		const isEmbeddedDiffEditor = this._diffEditor instanceof EmbeddedDiffEditorWidget2;

 		if (!isEmbeddedDiffEditor) {
 			const computationResult = observableFromEvent(e => this._diffEditor.onDidUpdateDiff(e), () => this._diffEditor.getDiffComputationResult());
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
@@ -10,7 +10,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { DiffElementViewModelBase, getFormattedMetadataJSON, getFormattedOutputJSON, OutputComparison, outputEqual, OUTPUT_EDITOR_HEIGHT_MAGIC, PropertyFoldingState, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DiffSide, DIFF_CELL_MARGIN, INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { CellEditType, CellUri, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
@@ -42,6 +41,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { fixedDiffEditorOptions, fixedEditorOptions, fixedEditorPadding } from 'vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { DiffEditorWidget2 } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';

 export function getOptimizedNestedCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
 	return {
@@ -242,7 +242,7 @@ abstract class AbstractElementRenderer extends Disposable {
 	protected _metadataInfoContainer!: HTMLElement;
 	protected _metadataEditorContainer?: HTMLElement;
 	protected _metadataEditorDisposeStore!: DisposableStore;
-	protected _metadataEditor?: CodeEditorWidget | DiffEditorWidget;
+	protected _metadataEditor?: CodeEditorWidget | DiffEditorWidget2;

 	protected _outputHeaderContainer!: HTMLElement;
 	protected _outputHeader!: PropertyHeader;
@@ -256,8 +256,8 @@ abstract class AbstractElementRenderer extends Disposable {
 	protected _outputLeftView?: OutputContainer;
 	protected _outputRightView?: OutputContainer;
 	protected _outputEditorDisposeStore!: DisposableStore;
-	protected _outputEditor?: CodeEditorWidget | DiffEditorWidget;
-	protected _outputMetadataEditor?: DiffEditorWidget;
+	protected _outputEditor?: CodeEditorWidget | DiffEditorWidget2;
+	protected _outputMetadataEditor?: DiffEditorWidget2;

 	protected _diffEditorContainer!: HTMLElement;
 	protected _diagonalFill?: HTMLElement;
@@ -493,7 +493,7 @@ abstract class AbstractElementRenderer extends Disposable {
 		this._metadataEditorDisposeStore.clear();

 		if (this.cell instanceof SideBySideDiffElementViewModel) {
-			this._metadataEditor = this.instantiationService.createInstance(DiffEditorWidget, this._metadataEditorContainer!, {
+			this._metadataEditor = this.instantiationService.createInstance(DiffEditorWidget2, this._metadataEditorContainer!, {
 				...fixedDiffEditorOptions,
 				overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
 				readOnly: false,
@@ -606,7 +606,7 @@ abstract class AbstractElementRenderer extends Disposable {

 				const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
 				const lineCount = Math.max(originalModel.getLineCount(), modifiedModel.getLineCount());
-				this._outputEditor = this.instantiationService.createInstance(DiffEditorWidget, this._outputEditorContainer!, {
+				this._outputEditor = this.instantiationService.createInstance(DiffEditorWidget2, this._outputEditorContainer!, {
 					...fixedDiffEditorOptions,
 					overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
 					readOnly: true,
@@ -1214,7 +1214,7 @@ export class InsertElement extends SingleSideDiffElement {
 }

 export class ModifiedElement extends AbstractElementRenderer {
-	private _editor?: DiffEditorWidget;
+	private _editor?: DiffEditorWidget2;
 	private _editorViewStateChanged: boolean;
 	private _editorContainer!: HTMLElement;
 	private _inputToolbarContainer!: HTMLElement;
@@ -1416,7 +1416,7 @@ export class ModifiedElement extends AbstractElementRenderer {

 				this._outputMetadataContainer.style.top = `${this.cell.layoutInfo.rawOutputHeight}px`;
 				// single output, metadata change, let's render a diff editor for metadata
-				this._outputMetadataEditor = this.instantiationService.createInstance(DiffEditorWidget, this._outputMetadataContainer!, {
+				this._outputMetadataEditor = this.instantiationService.createInstance(DiffEditorWidget2, this._outputMetadataContainer!, {
 					...fixedDiffEditorOptions,
 					overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
 					readOnly: true,
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
@@ -8,7 +8,7 @@ import { hash } from 'vs/base/common/hash';
 import { toFormattedString } from 'vs/base/common/jsonFormatter';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
+import { DiffEditorWidget2 } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';
 import { FontInfo } from 'vs/editor/common/config/fontInfo';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { fixedEditorPadding } from 'vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions';
@@ -341,10 +341,10 @@ export abstract class DiffElementViewModelBase extends Disposable {

 	getComputedCellContainerWidth(layoutInfo: NotebookLayoutInfo, diffEditor: boolean, fullWidth: boolean) {
 		if (fullWidth) {
-			return layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0) - 2;
+			return layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget2.ENTIRE_DIFF_OVERVIEW_WIDTH : 0) - 2;
 		}

-		return (layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0)) / 2 - 18 - 2;
+		return (layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget2.ENTIRE_DIFF_OVERVIEW_WIDTH : 0)) / 2 - 18 - 2;
 	}

 	getOutputEditorViewState(): editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null {
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
@@ -10,12 +10,12 @@ import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
 import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
 import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
 import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
+import { DiffEditorWidget2 } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';

 export enum DiffSide {
 	Original = 0,
@@ -85,7 +85,7 @@ export interface CellDiffSideBySideRenderTemplate extends CellDiffCommonRenderTe
 	readonly body: HTMLElement;
 	readonly diffEditorContainer: HTMLElement;
 	readonly elementDisposables: DisposableStore;
-	readonly sourceEditor: DiffEditorWidget;
+	readonly sourceEditor: DiffEditorWidget2;
 	readonly editorContainer: HTMLElement;
 	readonly inputToolbarContainer: HTMLElement;
 	readonly toolbar: WorkbenchToolBar;
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
@@ -18,7 +18,7 @@ import { DiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDif
 import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DIFF_CELL_MARGIN, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { DeletedElement, getOptimizedNestedCodeEditorWidgetOptions, InsertElement, ModifiedElement } from 'vs/workbench/contrib/notebook/browser/diff/diffComponents';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
+import { DiffEditorWidget2 } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';
 import { IMenuService, MenuItemAction } from 'vs/platform/actions/common/actions';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -234,7 +234,7 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 	private _buildSourceEditor(sourceContainer: HTMLElement) {
 		const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));

-		const editor = this.instantiationService.createInstance(DiffEditorWidget, editorContainer, {
+		const editor = this.instantiationService.createInstance(DiffEditorWidget2, editorContainer, {
 			...fixedDiffEditorOptions,
 			padding: {
 				top: 24,
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -29,7 +29,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { rot } from 'vs/base/common/numbers';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
+import { EmbeddedDiffEditorWidget2 } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { IDiffEditorOptions, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Action, IAction, ActionRunner } from 'vs/base/common/actions';
 import { IActionBarOptions } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -168,7 +168,7 @@ function getOuterEditorFromDiffEditor(accessor: ServicesAccessor): ICodeEditor |
 	const diffEditors = accessor.get(ICodeEditorService).listDiffEditors();

 	for (const diffEditor of diffEditors) {
-		if (diffEditor.hasTextFocus() && diffEditor instanceof EmbeddedDiffEditorWidget) {
+		if (diffEditor.hasTextFocus() && diffEditor instanceof EmbeddedDiffEditorWidget2) {
 			return diffEditor.getParentEditor();
 		}
 	}
@@ -178,7 +178,7 @@ function getOuterEditorFromDiffEditor(accessor: ServicesAccessor): ICodeEditor |

 class DirtyDiffWidget extends PeekViewWidget {

-	private diffEditor!: EmbeddedDiffEditorWidget;
+	private diffEditor!: EmbeddedDiffEditorWidget2;
 	private title: string;
 	private menu: IMenu | undefined;
 	private _index: number = 0;
@@ -412,7 +412,7 @@ class DirtyDiffWidget extends PeekViewWidget {
 			stickyScroll: { enabled: false }
 		};

-		this.diffEditor = this.instantiationService.createInstance(EmbeddedDiffEditorWidget, container, options, {}, this.editor);
+		this.diffEditor = this.instantiationService.createInstance(EmbeddedDiffEditorWidget2, container, options, {}, this.editor);
 		this._disposables.add(this.diffEditor);
 	}