From 6a58e3d32b411b2cc59ffcaca3abb40f6420f9a7 Mon Sep 17 00:00:00 2001
From: Qingpeng Li <qingpeng9802@gmail.com>
Date: Thu, 13 Oct 2022 10:54:45 +0000
Subject: [PATCH 01/94] improve `es5ClassCompat` robustness

---
 src/vs/workbench/api/common/extHostTypes.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index f7b89d987a9..d922d3ff504 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -29,15 +29,19 @@ import type * as vscode from 'vscode';
  * */
 function es5ClassCompat(target: Function): any {
 	const interceptFunctions = {
-		apply: function () {
-			const args = arguments.length === 1 ? [] : arguments[1];
-			return Reflect.construct(target, args, arguments[0].constructor);
-		},
-		call: function () {
-			if (arguments.length === 0) {
+		apply: function (...args: any[]): any {
+			if (args.length === 0) {
 				return Reflect.construct(target, []);
 			} else {
-				const [thisArg, ...restArgs] = arguments;
+				const argsList = args.length === 1 ? [] : args[1];
+				return Reflect.construct(target, argsList, args[0].constructor);
+			}
+		},
+		call: function (...args: any[]): any {
+			if (args.length === 0) {
+				return Reflect.construct(target, []);
+			} else {
+				const [thisArg, ...restArgs] = args;
 				return Reflect.construct(target, restArgs, thisArg.constructor);
 			}
 		}

From 6909a3a0d1c51de65b7bd37ef2f29d1cb987c630 Mon Sep 17 00:00:00 2001
From: Antonio Prudenzano <antoniotogo8@gmail.com>
Date: Sun, 7 May 2023 19:17:22 +0200
Subject: [PATCH 02/94] added focus_in and focus_out events only on HTMLElement
 elements

---
 src/vs/base/browser/dom.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 917fa90ca76..3a555f3d597 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -921,8 +921,11 @@ class FocusTracker extends Disposable implements IFocusTracker {
 
 		this._register(addDisposableListener(element, EventType.FOCUS, onFocus, true));
 		this._register(addDisposableListener(element, EventType.BLUR, onBlur, true));
-		this._register(addDisposableListener(element, EventType.FOCUS_IN, () => this._refreshStateHandler()));
-		this._register(addDisposableListener(element, EventType.FOCUS_OUT, () => this._refreshStateHandler()));
+		if (element instanceof HTMLElement) {
+			this._register(addDisposableListener(element, EventType.FOCUS_IN, () => this._refreshStateHandler()));
+			this._register(addDisposableListener(element, EventType.FOCUS_OUT, () => this._refreshStateHandler()));
+		}
+
 	}
 
 	refreshState() {

From 36b8f6d0375b0fe5cf1d842e2ef9f8949af367b9 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 14 Aug 2023 15:23:29 -0700
Subject: [PATCH 03/94] inline chat: fix leaks found in testing

Fixes some leaks I found while looking at https://github.com/microsoft/vscode/pull/190444, by adding ensureNoDisposablesAreLeakedInTestSuite to the suite.

I don't have a dev setup for inline chat, so I have not tested this beyond running tests and verifying the fix
---
 src/vs/base/browser/ui/toolbar/toolbar.ts     |  1 +
 .../diffEditorWidget2/diffEditorEditors.ts    |  4 +--
 .../suggest/browser/suggestController.ts      |  2 +-
 src/vs/platform/actions/browser/buttonbar.ts  |  2 +-
 .../browser/inlineChatController.ts           |  3 +-
 .../inlineChat/browser/inlineChatSession.ts   |  2 ++
 .../inlineChat/browser/inlineChatWidget.ts    |  8 ++---
 .../test/browser/inlineChatController.test.ts | 30 +++++++------------
 .../markers/test/browser/markersModel.test.ts |  3 ++
 9 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index 1a6089b5958..67a2401ecfe 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -212,6 +212,7 @@ export class ToolBar extends Disposable {
 
 	override dispose(): void {
 		this.clear();
+		this.disposables.dispose();
 		super.dispose();
 	}
 }
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
index cce99a94271..ee764c81aed 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
@@ -35,8 +35,8 @@ export class DiffEditorEditors extends Disposable {
 	) {
 		super();
 
-		this.original = this._createLeftHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.originalEditor || {});
-		this.modified = this._createRightHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.modifiedEditor || {});
+		this.original = this._register(this._createLeftHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.originalEditor || {}));
+		this.modified = this._register(this._createRightHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.modifiedEditor || {}));
 
 		this._register(autorunHandleChanges({
 			createEmptyChangeSummary: () => ({} as IDiffEditorConstructionOptions),
diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
index 887fb23cb2d..6450e989bce 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts
@@ -143,7 +143,7 @@ export class SuggestController implements IEditorContribution {
 		// context key: update insert/replace mode
 		const ctxInsertMode = SuggestContext.InsertMode.bindTo(_contextKeyService);
 		ctxInsertMode.set(editor.getOption(EditorOption.suggest).insertMode);
-		this.model.onDidTrigger(() => ctxInsertMode.set(editor.getOption(EditorOption.suggest).insertMode));
+		this._toDispose.add(this.model.onDidTrigger(() => ctxInsertMode.set(editor.getOption(EditorOption.suggest).insertMode)));
 
 		this.widget = this._toDispose.add(new IdleValue(() => {
 
diff --git a/src/vs/platform/actions/browser/buttonbar.ts b/src/vs/platform/actions/browser/buttonbar.ts
index cb6ab4c31df..4965d6bb5cd 100644
--- a/src/vs/platform/actions/browser/buttonbar.ts
+++ b/src/vs/platform/actions/browser/buttonbar.ts
@@ -55,7 +55,7 @@ export class MenuWorkbenchButtonBar extends ButtonBar {
 					'workbenchActionExecuted',
 					{ id: e.action.id, from: options.telemetrySource! }
 				);
-			}, this._store);
+			}, undefined, this._store);
 		}
 
 		const conifgProvider: IButtonConfigProvider = options?.buttonConfigProvider ?? (() => ({ showLabel: true }));
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index 104830cc852..f91de7e3ee8 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -100,7 +100,7 @@ export class InlineChatController implements IEditorContribution {
 
 	private _messages = this._store.add(new Emitter<Message>());
 
-	private readonly _sessionStore: DisposableStore = new DisposableStore();
+	private readonly _sessionStore: DisposableStore = this._store.add(new DisposableStore());
 	private readonly _stashedSession: MutableDisposable<StashedSession> = this._store.add(new MutableDisposable());
 	private _activeSession?: Session;
 	private _strategy?: EditModeStrategy;
@@ -146,6 +146,7 @@ export class InlineChatController implements IEditorContribution {
 	}
 
 	dispose(): void {
+		this._strategy?.dispose();
 		this._stashedSession.clear();
 		this.finishExistingSession();
 		this._store.dispose();
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
index 434aea1f4d2..fcbb998dc79 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
@@ -385,6 +385,8 @@ export interface IInlineChatSessionService {
 	//
 
 	recordings(): readonly Recording[];
+
+	dispose(): void;
 }
 
 type SessionData = {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
index bf16c0aec05..8619088ce96 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
@@ -230,7 +230,7 @@ export class InlineChatWidget {
 		}));
 
 		const uri = URI.from({ scheme: 'vscode', authority: 'inline-chat', path: `/inline-chat/model${InlineChatWidget._modelPool++}.txt` });
-		this._inputModel = this._modelService.getModel(uri) ?? this._modelService.createModel('', null, uri);
+		this._inputModel = this._store.add(this._modelService.getModel(uri) ?? this._modelService.createModel('', null, uri));
 		this._inputEditor.setModel(this._inputModel);
 
 		// --- context keys
@@ -359,13 +359,13 @@ export class InlineChatWidget {
 		this._store.add(feedbackToolbar);
 
 		// preview editors
-		this._previewDiffEditor = new IdleValue(() => this._store.add(_instantiationService.createInstance(EmbeddedDiffEditorWidget2, this._elements.previewDiff, {
+		this._previewDiffEditor = this._store.add(new IdleValue(() => this._store.add(_instantiationService.createInstance(EmbeddedDiffEditorWidget2, this._elements.previewDiff, {
 			..._previewEditorEditorOptions,
 			onlyShowAccessibleDiffViewer: this._accessibilityService.isScreenReaderOptimized(),
-		}, { modifiedEditor: codeEditorWidgetOptions, originalEditor: codeEditorWidgetOptions }, parentEditor)));
+		}, { modifiedEditor: codeEditorWidgetOptions, originalEditor: codeEditorWidgetOptions }, parentEditor))));
 
 		this._previewCreateTitle = this._store.add(_instantiationService.createInstance(ResourceLabel, this._elements.previewCreateTitle, { supportIcons: true }));
-		this._previewCreateEditor = new IdleValue(() => this._store.add(_instantiationService.createInstance(EmbeddedCodeEditorWidget, this._elements.previewCreate, _previewEditorEditorOptions, codeEditorWidgetOptions, parentEditor)));
+		this._previewCreateEditor = this._store.add(new IdleValue(() => this._store.add(_instantiationService.createInstance(EmbeddedCodeEditorWidget, this._elements.previewCreate, _previewEditorEditorOptions, codeEditorWidgetOptions, parentEditor))));
 
 		this._elements.message.tabIndex = 0;
 		this._elements.message.ariaLabel = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.InlineChat);
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
index ab5e4b27e1b..476dfbe33db 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -24,11 +24,11 @@ import { IEditorProgressService, IProgressRunner } from 'vs/platform/progress/co
 import { mock } from 'vs/base/test/common/mock';
 import { Emitter, Event } from 'vs/base/common/event';
 import { equals } from 'vs/base/common/arrays';
-import { timeout } from 'vs/base/common/async';
 import { IChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/chat';
 import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('InteractiveChatController', function () {
 
@@ -114,11 +114,11 @@ suite('InteractiveChatController', function () {
 			}]
 		);
 
-		instaService = workbenchInstantiationService(undefined, store).createChild(serviceCollection);
-		inlineChatSessionService = instaService.get(IInlineChatSessionService);
+		instaService = store.add(workbenchInstantiationService(undefined, store).createChild(serviceCollection));
+		inlineChatSessionService = store.add(instaService.get(IInlineChatSessionService));
 
-		model = instaService.get(IModelService).createModel('Hello\nWorld\nHello Again\nHello World\n', null);
-		editor = instantiateTestCodeEditor(instaService, model);
+		model = store.add(instaService.get(IModelService).createModel('Hello\nWorld\nHello Again\nHello World\n', null));
+		editor = store.add(instantiateTestCodeEditor(instaService, model));
 
 		store.add(inlineChatService.addProvider({
 			debugName: 'Unit Test',
@@ -142,13 +142,14 @@ suite('InteractiveChatController', function () {
 	});
 
 	teardown(function () {
-		editor.dispose();
-		model.dispose();
 		store.clear();
 		ctrl?.dispose();
 	});
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('creation, not showing anything', function () {
+		for (let deadline = Date.now() + 1000; Date.now() < deadline;) { }
 		ctrl = instaService.createInstance(TestController, editor);
 		assert.ok(ctrl);
 		assert.strictEqual(ctrl.getWidgetPosition(), undefined);
@@ -295,19 +296,8 @@ suite('InteractiveChatController', function () {
 					wholeRange: new Range(3, 1, 3, 3)
 				};
 			},
-			async provideResponse(session, request) {
-
-				// SLOW response
-				await timeout(50000);
-
-				return {
-					type: InlineChatResponseType.EditorEdit,
-					id: Math.random(),
-					edits: [{
-						range: new Range(1, 1, 1, 1), // EDIT happens outside of whole range
-						text: `${request.prompt}\n${request.prompt}`
-					}]
-				};
+			provideResponse(session, request) {
+				return new Promise<never>(() => { });
 			}
 		});
 		store.add(d);
diff --git a/src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts b/src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts
index 9cb2c9dc650..b8334c948d6 100644
--- a/src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts
+++ b/src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts
@@ -8,6 +8,7 @@ import { URI } from 'vs/base/common/uri';
 import { IMarker, MarkerSeverity, IRelatedInformation } from 'vs/platform/markers/common/markers';
 import { MarkersModel, Marker, ResourceMarkers, RelatedInformation } from 'vs/workbench/contrib/markers/browser/markersModel';
 import { groupBy } from 'vs/base/common/collections';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 class TestMarkersModel extends MarkersModel {
 
@@ -27,6 +28,8 @@ class TestMarkersModel extends MarkersModel {
 
 suite('MarkersModel Test', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('marker ids are unique', function () {
 		const marker1 = anErrorWithRange(3);
 		const marker2 = anErrorWithRange(3);

From ebfe7fabfb11c763896c20c09ea6b386fbf021e3 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Wed, 30 Aug 2023 11:37:44 +0200
Subject: [PATCH 04/94] wip - define jsdoc lint rules for vscode.d.ts

---
 .eslintrc.json | 41 +++++++++++++++++++++++++++
 package.json   |  2 +-
 yarn.lock      | 76 +++++++++++++++++++++++++++++---------------------
 3 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 0644079623d..b2c303da84a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -196,6 +196,47 @@
 				]
 			}
 		},
+		{
+			"files": [
+				"**/vscode.d.ts"
+			],
+			"rules": {
+				"extends": [
+					"plugin:jsdoc/recommended-typescript"
+				],
+				"jsdoc/tag-lines": "off",
+				"jsdoc/valid-types": "off",
+				"jsdoc/no-multi-asterisks": [
+					"warn",
+					{
+						"allowWhitespace": true
+					}
+				],
+				"jsdoc/require-jsdoc": [
+					"warn",
+					{
+						"enableFixer": false,
+						"contexts": [
+							"TSInterfaceDeclaration",
+							"TSPropertySignature",
+							"TSMethodSignature",
+							"ClassDeclaration",
+							"MethodDefinition",
+							"PropertyDeclaration",
+							"TSEnumDeclaration",
+							"TSEnumMember",
+							"ExportNamedDeclaration"
+						]
+					}
+				],
+				"jsdoc/check-param-names": [
+					"warn",
+					{
+						"enableFixer": false
+					}
+				]
+			}
+		},
 		{
 			"files": [
 				"src/**/{common,browser}/**/*.ts"
diff --git a/package.json b/package.json
index 4dbaa275413..99b6034460c 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "electron": "25.5.0",
     "eslint": "8.36.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-jsdoc": "^39.3.2",
+    "eslint-plugin-jsdoc": "^46.5.0",
     "eslint-plugin-local": "^1.0.0",
     "event-stream": "3.3.4",
     "fancy-log": "^1.3.3",
diff --git a/yarn.lock b/yarn.lock
index 582d6e845a1..e651e4a891d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,14 +325,14 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
-"@es-joy/jsdoccomment@~0.31.0":
-  version "0.31.0"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.31.0.tgz#dbc342cc38eb6878c12727985e693eaef34302bc"
-  integrity sha512-tc1/iuQcnaiSIUVad72PBierDFpsxdUHtEF/OrfqvM1CBAsIoMP51j52jTMb3dXriwhieTo289InzZj72jL3EQ==
+"@es-joy/jsdoccomment@~0.40.1":
+  version "0.40.1"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz#13acd77fb372ed1c83b7355edd865a3b370c9ec4"
+  integrity sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg==
   dependencies:
-    comment-parser "1.3.1"
-    esquery "^1.4.0"
-    jsdoc-type-pratt-parser "~3.1.0"
+    comment-parser "1.4.0"
+    esquery "^1.5.0"
+    jsdoc-type-pratt-parser "~4.0.0"
 
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.0"
@@ -1841,6 +1841,11 @@ archy@^1.0.0:
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
 
+are-docs-informative@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
+  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
+
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -2289,6 +2294,11 @@ buffer@^5.2.1, buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+builtin-modules@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
+
 bytes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
@@ -2797,10 +2807,10 @@ commandpost@^1.0.0:
   resolved "https://registry.yarnpkg.com/commandpost/-/commandpost-1.2.1.tgz#2e9c4c7508b9dc704afefaa91cab92ee6054cc68"
   integrity sha512-V1wzc+DTFsO96te2W/U+fKNRSOWtOwXhkkZH2WRLLbucrY+YrDNsRr4vtfSf83MUZVF3E6B4nwT30fqaTpzipQ==
 
-comment-parser@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
-  integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==
+comment-parser@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.0.tgz#0f8c560f59698193854f12884c20c0e39a26d32c"
+  integrity sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==
 
 component-emitter@^1.2.1:
   version "1.3.0"
@@ -3822,17 +3832,19 @@ eslint-plugin-header@3.1.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz#6ce512432d57675265fac47292b50d1eff11acd6"
   integrity sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==
 
-eslint-plugin-jsdoc@^39.3.2:
-  version "39.3.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.2.tgz#b9c3becdbd860a75b8bd07bd04a0eaaad7c79403"
-  integrity sha512-RSGN94RYzIJS/WfW3l6cXzRLfJWxvJgNQZ4w0WCaxJWDJMigtwTsILEAfKqmmPkT2rwMH/s3C7G5ChDE6cwPJg==
+eslint-plugin-jsdoc@^46.5.0:
+  version "46.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.5.0.tgz#02e7945701a01fab76e7ced850d4d1eea63c23c0"
+  integrity sha512-aulXdA4I1dyWpzyS1Nh/GNoS6PavzeucxEapnMR4JUERowWvaEk2Y4A5irpHAcdXtBBHLVe8WIhdXNjoAlGQgA==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.31.0"
-    comment-parser "1.3.1"
+    "@es-joy/jsdoccomment" "~0.40.1"
+    are-docs-informative "^0.0.2"
+    comment-parser "1.4.0"
     debug "^4.3.4"
     escape-string-regexp "^4.0.0"
-    esquery "^1.4.0"
-    semver "^7.3.7"
+    esquery "^1.5.0"
+    is-builtin-module "^3.2.1"
+    semver "^7.5.4"
     spdx-expression-parse "^3.0.1"
 
 eslint-plugin-local@^1.0.0:
@@ -3999,14 +4011,7 @@ esquery@^1.0.1:
   dependencies:
     estraverse "^5.1.0"
 
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
-  dependencies:
-    estraverse "^5.1.0"
-
-esquery@^1.4.2:
+esquery@^1.4.2, esquery@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
@@ -5683,6 +5688,13 @@ is-buffer@^1.1.5, is-buffer@~1.1.1:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-builtin-module@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
+  integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
+  dependencies:
+    builtin-modules "^3.3.0"
+
 is-callable@^1.1.4, is-callable@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
@@ -6143,10 +6155,10 @@ jschardet@3.0.0:
   resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.0.0.tgz#898d2332e45ebabbdb6bf2feece9feea9a99e882"
   integrity sha512-lJH6tJ77V8Nzd5QWRkFYCLc13a3vADkh3r/Fi8HupZGWk2OVVDfnZP8V/VgQgZ+lzW0kG2UGb5hFgt3V3ndotQ==
 
-jsdoc-type-pratt-parser@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz#a4a56bdc6e82e5865ffd9febc5b1a227ff28e67e"
-  integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
+jsdoc-type-pratt-parser@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
+  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
 
 jsesc@^2.5.1:
   version "2.5.2"
@@ -8895,7 +8907,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==

From 3ea4d66a5b943aafd6585fc546c2899958093f29 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 30 Aug 2023 18:04:52 +0200
Subject: [PATCH 05/94] changing to use code action instead of setting

---
 .../client/src/jsonClient.ts                  | 32 +++++++------------
 .../json-language-features/package.json       |  6 ----
 .../json-language-features/package.nls.json   |  1 -
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts
index 23410ebb814..a801245a46d 100644
--- a/extensions/json-language-features/client/src/jsonClient.ts
+++ b/extensions/json-language-features/client/src/jsonClient.ts
@@ -8,7 +8,7 @@ export type JSONLanguageStatus = { schemas: string[] };
 import {
 	workspace, window, languages, commands, ExtensionContext, extensions, Uri, ColorInformation,
 	Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange,
-	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n, TextEditorOptions
+	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n, CodeActionKind, CodeAction
 } from 'vscode';
 import {
 	LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions,
@@ -102,7 +102,6 @@ export type JSONSchemaSettings = {
 export namespace SettingIds {
 	export const enableFormatter = 'json.format.enable';
 	export const enableKeepLines = 'json.format.keepLines';
-	export const enableSortOnSave = 'json.sortOnSave.enable';
 	export const enableValidation = 'json.validate.enable';
 	export const enableSchemaDownload = 'json.schemaDownload.enable';
 	export const maxItemsComputed = 'json.maxItemsComputed';
@@ -171,15 +170,6 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
 		window.showInformationMessage(l10n.t('JSON schema cache cleared.'));
 	}));
 
-	toDispose.push(workspace.onWillSaveTextDocument(event => {
-		const sortOnSave = workspace.getConfiguration().get<boolean>(SettingIds.enableSortOnSave);
-		const document = event.document;
-		if (sortOnSave && (document.languageId === 'json' || document.languageId === 'jsonc')) {
-			const documentOptions = getOptionsForDocument(document);
-			const textEditsPromise = getSortTextEdits(document, documentOptions?.tabSize, documentOptions?.insertSpaces);
-			event.waitUntil(textEditsPromise);
-		}
-	}));
 
 	toDispose.push(commands.registerCommand('json.sort', async () => {
 
@@ -312,6 +302,17 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
 					return r.then(checkLimit);
 				}
 				return checkLimit(r);
+			},
+			provideCodeActions(doc) {
+				console.log('doc : ', doc);
+				console.log('inside of provideCodeActions');
+				const codeActions: CodeAction[] = [];
+				const sortCodeAction = new CodeAction('Sort JSON', CodeActionKind.Source);
+				sortCodeAction.command = {
+					command: 'json.sort',
+					title: 'Sort JSON'
+				};
+				return codeActions;
 			}
 		}
 	};
@@ -643,12 +644,3 @@ function updateMarkdownString(h: MarkdownString): MarkdownString {
 function isSchemaResolveError(d: Diagnostic) {
 	return d.code === /* SchemaResolveError */ 0x300;
 }
-
-function getOptionsForDocument(document: TextDocument): TextEditorOptions | undefined {
-	for (const editor of window.visibleTextEditors) {
-		if (editor.document.uri.toString() === document.uri.toString()) {
-			return editor.options;
-		}
-	}
-	return;
-}
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index cd9e69d69b4..f804c30da79 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -91,12 +91,6 @@
           "default": false,
           "description": "%json.format.keepLines.desc%"
         },
-        "json.sortOnSave.enable": {
-          "type": "boolean",
-          "scope": "window",
-          "default": false,
-          "description": "%json.sortOnSave.enable.desc%"
-        },
         "json.trace.server": {
           "type": "string",
           "scope": "window",
diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json
index df68b3f8eac..2586bc6ab0a 100644
--- a/extensions/json-language-features/package.nls.json
+++ b/extensions/json-language-features/package.nls.json
@@ -8,7 +8,6 @@
 	"json.schemas.schema.desc": "The schema definition for the given URL. The schema only needs to be provided to avoid accesses to the schema URL.",
 	"json.format.enable.desc": "Enable/disable default JSON formatter",
 	"json.format.keepLines.desc" : "Keep all existing new lines when formatting.",
-	"json.sortOnSave.enable.desc": "Enable/disable default sorting on save",
 	"json.validate.enable.desc": "Enable/disable JSON validation.",
 	"json.tracing.desc": "Traces the communication between VS Code and the JSON language server.",
 	"json.colorDecorators.enable.desc": "Enables or disables color decorators",

From fffb813460a4c51dc04f1391600c9f2f5018d13d Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 31 Aug 2023 11:19:33 +0200
Subject: [PATCH 06/94] adding code

---
 .../client/src/jsonClient.ts                  | 24 +++++++++----------
 .../server/src/jsonServer.ts                  | 21 +++++++++++++---
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts
index a801245a46d..ac918999e1a 100644
--- a/extensions/json-language-features/client/src/jsonClient.ts
+++ b/extensions/json-language-features/client/src/jsonClient.ts
@@ -8,12 +8,12 @@ export type JSONLanguageStatus = { schemas: string[] };
 import {
 	workspace, window, languages, commands, ExtensionContext, extensions, Uri, ColorInformation,
 	Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange,
-	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n, CodeActionKind, CodeAction
+	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n, CodeActionContext, CodeAction, Command,
 } from 'vscode';
 import {
 	LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions,
 	DidChangeConfigurationNotification, HandleDiagnosticsSignature, ResponseError, DocumentRangeFormattingParams,
-	DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, ProvideHoverSignature, BaseLanguageClient, ProvideFoldingRangeSignature, ProvideDocumentSymbolsSignature, ProvideDocumentColorsSignature
+	DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, ProvideHoverSignature, BaseLanguageClient, ProvideFoldingRangeSignature, ProvideDocumentSymbolsSignature, ProvideDocumentColorsSignature, ProvideCodeActionsSignature
 } from 'vscode-languageclient';
 
 
@@ -172,7 +172,6 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
 
 
 	toDispose.push(commands.registerCommand('json.sort', async () => {
-
 		if (isClientReady) {
 			const textEditor = window.activeTextEditor;
 			if (textEditor) {
@@ -303,16 +302,15 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
 				}
 				return checkLimit(r);
 			},
-			provideCodeActions(doc) {
-				console.log('doc : ', doc);
-				console.log('inside of provideCodeActions');
-				const codeActions: CodeAction[] = [];
-				const sortCodeAction = new CodeAction('Sort JSON', CodeActionKind.Source);
-				sortCodeAction.command = {
-					command: 'json.sort',
-					title: 'Sort JSON'
-				};
-				return codeActions;
+			provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken, next: ProvideCodeActionsSignature) {
+				console.log('inside of provide code actions');
+				console.log('next : ', next);
+				const r = next(document, range, context, token);
+				console.log('r : ', r);
+				if (isThenable<(Command | CodeAction)[] | null | undefined>(r)) {
+					return r;
+				}
+				return r;
 			}
 		}
 	};
diff --git a/extensions/json-language-features/server/src/jsonServer.ts b/extensions/json-language-features/server/src/jsonServer.ts
index 0282e6fa939..ae14131082c 100644
--- a/extensions/json-language-features/server/src/jsonServer.ts
+++ b/extensions/json-language-features/server/src/jsonServer.ts
@@ -6,12 +6,12 @@
 import {
 	Connection,
 	TextDocuments, InitializeParams, InitializeResult, NotificationType, RequestType,
-	DocumentRangeFormattingRequest, Disposable, ServerCapabilities, TextDocumentSyncKind, TextEdit, DocumentFormattingRequest, TextDocumentIdentifier, FormattingOptions, Diagnostic
+	DocumentRangeFormattingRequest, Disposable, ServerCapabilities, TextDocumentSyncKind, TextEdit, DocumentFormattingRequest, TextDocumentIdentifier, FormattingOptions, Diagnostic, CodeActionKind
 } from 'vscode-languageserver';
 
 import { runSafe, runSafeAsync } from './utils/runner';
 import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnosticsPushSupport } from './utils/validation';
-import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions } from 'vscode-json-languageservice';
+import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions, CodeAction } from 'vscode-json-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
 import { Utils, URI } from 'vscode-uri';
 
@@ -188,7 +188,8 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 				documentSelector: null,
 				interFileDependencies: false,
 				workspaceDiagnostics: false
-			}
+			},
+			codeActionProvider: true
 		};
 
 		return { capabilities };
@@ -411,6 +412,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 
 	connection.onDocumentSymbol((documentSymbolParams, token) => {
 		return runSafe(runtime, () => {
+			console.log('inside of on document symbol');
 			const document = documents.get(documentSymbolParams.textDocument.uri);
 			if (document) {
 				const jsonDocument = getJSONDocument(document);
@@ -424,6 +426,19 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token);
 	});
 
+	connection.onCodeAction((_codeActionParams, token) => {
+		return runSafe(runtime, () => {
+			console.log('Inside of on code action');
+			const codeActions: CodeAction[] = [];
+			const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source);
+			sortCodeAction.command = {
+				command: 'json.sort',
+				title: 'Sort JSON'
+			};
+			return codeActions;
+		}, [], `Error while retrieving code actions`, token);
+	});
+
 	function onFormat(textDocument: TextDocumentIdentifier, range: Range | undefined, options: FormattingOptions): TextEdit[] {
 
 		options.keepLines = keepLinesEnabled;

From 31b6e070b2e97a7518cda7af1011b71b6383029f Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Thu, 31 Aug 2023 12:11:59 +0200
Subject: [PATCH 07/94] use CSS mask and icon-foreground color so that
 customized foreground colors also work for CSS

---
 .../browser/menuEntryActionViewItem.ts        | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
index 356ff5e1013..5a053caa296 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, addDisposableListener, append, asCSSUrl, EventType, ModifierKeyEmitter, prepend } from 'vs/base/browser/dom';
+import { $, addDisposableListener, append, asCSSUrl, EventType, ModifierKeyEmitter, prepend, reset } from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { ActionViewItem, BaseActionViewItem, SelectActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
@@ -257,17 +257,26 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 			});
 
 		} else {
-			// icon path/url
-			label.style.backgroundImage = (
-				isDark(this._themeService.getColorTheme().type)
-					? asCSSUrl(icon.dark)
-					: asCSSUrl(icon.light)
-			);
+			// icon path/url - add special element with SVG-mask and icon color background
+			const svgUrl = isDark(this._themeService.getColorTheme().type)
+				? asCSSUrl(icon.dark)
+				: asCSSUrl(icon.light);
+
+			const svgIcon = $('span');
+			svgIcon.style.webkitMask = `${svgUrl} no-repeat 50% 50%`;
+			svgIcon.style.webkitMaskOrigin = 'padding';
+			svgIcon.style.background = 'var(--vscode-icon-foreground)';
+			svgIcon.style.display = 'inline-block';
+			svgIcon.style.width = '100%';
+			svgIcon.style.height = '100%';
+
+			label.appendChild(svgIcon);
 			label.classList.add('icon');
+
 			this._itemClassDispose.value = combinedDisposable(
 				toDisposable(() => {
-					label.style.backgroundImage = '';
 					label.classList.remove('icon');
+					reset(label);
 				}),
 				this._themeService.onDidColorThemeChange(() => {
 					// refresh when the theme changes in case we go between dark <-> light

From 5306d2b89814ca1e52d4d9e7929dbc8c8cb18157 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Thu, 31 Aug 2023 12:21:38 +0200
Subject: [PATCH 08/94] don't inherit color for codicons from parent but use
 theme defined color

---
 src/vs/workbench/browser/media/part.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/vs/workbench/browser/media/part.css b/src/vs/workbench/browser/media/part.css
index bec9b2a6d75..a0628d68945 100644
--- a/src/vs/workbench/browser/media/part.css
+++ b/src/vs/workbench/browser/media/part.css
@@ -82,10 +82,6 @@
 	display: none;
 }
 
-.monaco-workbench .part > .title > .title-actions .action-label.codicon {
-	color: inherit;
-}
-
 .monaco-workbench .part > .content {
 	font-size: 13px;
 }

From 596a9a8926eafd92b4b5a127cb6740da710f4c79 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Thu, 31 Aug 2023 12:24:29 +0200
Subject: [PATCH 09/94] removed unneccessary mask property, make FF happy

---
 src/vs/platform/actions/browser/menuEntryActionViewItem.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
index 5a053caa296..c6e7a926213 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
@@ -263,8 +263,7 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 				: asCSSUrl(icon.light);
 
 			const svgIcon = $('span');
-			svgIcon.style.webkitMask = `${svgUrl} no-repeat 50% 50%`;
-			svgIcon.style.webkitMaskOrigin = 'padding';
+			svgIcon.style.webkitMask = svgIcon.style.mask = `${svgUrl} no-repeat 50% 50%`;
 			svgIcon.style.background = 'var(--vscode-icon-foreground)';
 			svgIcon.style.display = 'inline-block';
 			svgIcon.style.width = '100%';

From 06fdc0a6339c1b10c4b0d9739191d7606d43e9cb Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 31 Aug 2023 15:10:14 +0200
Subject: [PATCH 10/94] unsure how to register the provider

---
 .../client/src/jsonClient.ts                  | 52 +++++++++++++++----
 .../server/src/jsonServer.ts                  | 11 ++--
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts
index ac918999e1a..171d1c33d44 100644
--- a/extensions/json-language-features/client/src/jsonClient.ts
+++ b/extensions/json-language-features/client/src/jsonClient.ts
@@ -8,7 +8,7 @@ export type JSONLanguageStatus = { schemas: string[] };
 import {
 	workspace, window, languages, commands, ExtensionContext, extensions, Uri, ColorInformation,
 	Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange,
-	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n, CodeActionContext, CodeAction, Command,
+	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n, CodeActionContext, CodeAction, Command, CodeActionProvider, Selection, CodeActionKind,
 } from 'vscode';
 import {
 	LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions,
@@ -172,6 +172,7 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
 
 
 	toDispose.push(commands.registerCommand('json.sort', async () => {
+
 		if (isClientReady) {
 			const textEditor = window.activeTextEditor;
 			if (textEditor) {
@@ -189,6 +190,35 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
 		}
 	}));
 
+	class JSONCodeActionProvider implements CodeActionProvider {
+
+		provideCodeActions(document: TextDocument, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<(CodeAction | Command)[]> {
+			console.log('inside of provide code actions');
+			const codeActions: CodeAction[] = [];
+			const sortCodeAction = new CodeAction('Sort JSON', CodeActionKind.Source);
+			sortCodeAction.command = {
+				command: 'json.sort',
+				title: 'Sort JSON'
+			};
+			return codeActions;
+		}
+	}
+
+	languages.registerCodeActionsProvider('*', new JSONCodeActionProvider());
+
+	// connection.onCodeAction((_codeActionParams, token) => {
+	// 	return runSafe(runtime, () => {
+	// 		console.log('Inside of on code action');
+	// 		const codeActions: CodeAction[] = [];
+	// 		const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source);
+	// 		sortCodeAction.command = {
+	// 			command: 'json.sort',
+	// 			title: 'Sort JSON'
+	// 		};
+	// 		return codeActions;
+	// 	}, [], `Error while retrieving code actions`, token);
+	// });
+
 	// Options to control the language client
 	const clientOptions: LanguageClientOptions = {
 		// Register the server for json documents
@@ -302,16 +332,16 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
 				}
 				return checkLimit(r);
 			},
-			provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken, next: ProvideCodeActionsSignature) {
-				console.log('inside of provide code actions');
-				console.log('next : ', next);
-				const r = next(document, range, context, token);
-				console.log('r : ', r);
-				if (isThenable<(Command | CodeAction)[] | null | undefined>(r)) {
-					return r;
-				}
-				return r;
-			}
+			// provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken, next: ProvideCodeActionsSignature) {
+			// 	console.log('inside of provide code actions');
+			// 	console.log('next : ', next);
+			// 	const r = next(document, range, context, token);
+			// 	console.log('r : ', r);
+			// 	if (isThenable<(Command | CodeAction)[] | null | undefined>(r)) {
+			// 		return r;
+			// 	}
+			// 	return r;
+			// }
 		}
 	};
 
diff --git a/extensions/json-language-features/server/src/jsonServer.ts b/extensions/json-language-features/server/src/jsonServer.ts
index ae14131082c..82c6a3cc317 100644
--- a/extensions/json-language-features/server/src/jsonServer.ts
+++ b/extensions/json-language-features/server/src/jsonServer.ts
@@ -6,12 +6,12 @@
 import {
 	Connection,
 	TextDocuments, InitializeParams, InitializeResult, NotificationType, RequestType,
-	DocumentRangeFormattingRequest, Disposable, ServerCapabilities, TextDocumentSyncKind, TextEdit, DocumentFormattingRequest, TextDocumentIdentifier, FormattingOptions, Diagnostic, CodeActionKind
+	DocumentRangeFormattingRequest, Disposable, ServerCapabilities, TextDocumentSyncKind, TextEdit, DocumentFormattingRequest, TextDocumentIdentifier, FormattingOptions, Diagnostic, CodeAction, CodeActionKind
 } from 'vscode-languageserver';
 
 import { runSafe, runSafeAsync } from './utils/runner';
 import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnosticsPushSupport } from './utils/validation';
-import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions, CodeAction } from 'vscode-json-languageservice';
+import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions } from 'vscode-json-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
 import { Utils, URI } from 'vscode-uri';
 
@@ -412,7 +412,6 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 
 	connection.onDocumentSymbol((documentSymbolParams, token) => {
 		return runSafe(runtime, () => {
-			console.log('inside of on document symbol');
 			const document = documents.get(documentSymbolParams.textDocument.uri);
 			if (document) {
 				const jsonDocument = getJSONDocument(document);
@@ -426,6 +425,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token);
 	});
 
+	//
 	connection.onCodeAction((_codeActionParams, token) => {
 		return runSafe(runtime, () => {
 			console.log('Inside of on code action');
@@ -439,6 +439,11 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		}, [], `Error while retrieving code actions`, token);
 	});
 
+	connection.onCodeActionResolve(async (codeAction, token) => {
+		return codeAction;
+	});
+	//
+
 	function onFormat(textDocument: TextDocumentIdentifier, range: Range | undefined, options: FormattingOptions): TextEdit[] {
 
 		options.keepLines = keepLinesEnabled;

From 70694338048e575132149ac39b91102cb552d6f9 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 31 Aug 2023 15:34:10 +0200
Subject: [PATCH 11/94] cleaning the code

---
 .../client/src/jsonClient.ts                  | 45 ++-----------------
 .../server/src/jsonServer.ts                  | 30 ++++++-------
 2 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts
index 171d1c33d44..3f191f165cf 100644
--- a/extensions/json-language-features/client/src/jsonClient.ts
+++ b/extensions/json-language-features/client/src/jsonClient.ts
@@ -8,12 +8,12 @@ export type JSONLanguageStatus = { schemas: string[] };
 import {
 	workspace, window, languages, commands, ExtensionContext, extensions, Uri, ColorInformation,
 	Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange,
-	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n, CodeActionContext, CodeAction, Command, CodeActionProvider, Selection, CodeActionKind,
+	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n
 } from 'vscode';
 import {
 	LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions,
 	DidChangeConfigurationNotification, HandleDiagnosticsSignature, ResponseError, DocumentRangeFormattingParams,
-	DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, ProvideHoverSignature, BaseLanguageClient, ProvideFoldingRangeSignature, ProvideDocumentSymbolsSignature, ProvideDocumentColorsSignature, ProvideCodeActionsSignature
+	DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, ProvideHoverSignature, BaseLanguageClient, ProvideFoldingRangeSignature, ProvideDocumentSymbolsSignature, ProvideDocumentColorsSignature
 } from 'vscode-languageclient';
 
 
@@ -190,35 +190,6 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
 		}
 	}));
 
-	class JSONCodeActionProvider implements CodeActionProvider {
-
-		provideCodeActions(document: TextDocument, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<(CodeAction | Command)[]> {
-			console.log('inside of provide code actions');
-			const codeActions: CodeAction[] = [];
-			const sortCodeAction = new CodeAction('Sort JSON', CodeActionKind.Source);
-			sortCodeAction.command = {
-				command: 'json.sort',
-				title: 'Sort JSON'
-			};
-			return codeActions;
-		}
-	}
-
-	languages.registerCodeActionsProvider('*', new JSONCodeActionProvider());
-
-	// connection.onCodeAction((_codeActionParams, token) => {
-	// 	return runSafe(runtime, () => {
-	// 		console.log('Inside of on code action');
-	// 		const codeActions: CodeAction[] = [];
-	// 		const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source);
-	// 		sortCodeAction.command = {
-	// 			command: 'json.sort',
-	// 			title: 'Sort JSON'
-	// 		};
-	// 		return codeActions;
-	// 	}, [], `Error while retrieving code actions`, token);
-	// });
-
 	// Options to control the language client
 	const clientOptions: LanguageClientOptions = {
 		// Register the server for json documents
@@ -331,17 +302,7 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
 					return r.then(checkLimit);
 				}
 				return checkLimit(r);
-			},
-			// provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken, next: ProvideCodeActionsSignature) {
-			// 	console.log('inside of provide code actions');
-			// 	console.log('next : ', next);
-			// 	const r = next(document, range, context, token);
-			// 	console.log('r : ', r);
-			// 	if (isThenable<(Command | CodeAction)[] | null | undefined>(r)) {
-			// 		return r;
-			// 	}
-			// 	return r;
-			// }
+			}
 		}
 	};
 
diff --git a/extensions/json-language-features/server/src/jsonServer.ts b/extensions/json-language-features/server/src/jsonServer.ts
index 82c6a3cc317..d88b80587dc 100644
--- a/extensions/json-language-features/server/src/jsonServer.ts
+++ b/extensions/json-language-features/server/src/jsonServer.ts
@@ -425,25 +425,21 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token);
 	});
 
-	//
-	connection.onCodeAction((_codeActionParams, token) => {
-		return runSafe(runtime, () => {
-			console.log('Inside of on code action');
-			const codeActions: CodeAction[] = [];
-			const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source);
-			sortCodeAction.command = {
-				command: 'json.sort',
-				title: 'Sort JSON'
-			};
-			return codeActions;
-		}, [], `Error while retrieving code actions`, token);
+	connection.onCodeAction((codeActionParams, token) => {
+		return runSafeAsync(runtime, async () => {
+			const document = documents.get(codeActionParams.textDocument.uri);
+			if (document) {
+				const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source);
+				sortCodeAction.command = {
+					command: 'json.sort',
+					title: 'Sort JSON'
+				};
+				return [sortCodeAction];
+			}
+			return [];
+		}, [], `Error while computing code actions for ${codeActionParams.textDocument.uri}`, token);
 	});
 
-	connection.onCodeActionResolve(async (codeAction, token) => {
-		return codeAction;
-	});
-	//
-
 	function onFormat(textDocument: TextDocumentIdentifier, range: Range | undefined, options: FormattingOptions): TextEdit[] {
 
 		options.keepLines = keepLinesEnabled;

From ab975ebe2868796ef2847b5fe4389a078f0c1cd5 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 31 Aug 2023 16:02:06 +0200
Subject: [PATCH 12/94] adding also sort and json into the name

---
 extensions/json-language-features/server/src/jsonServer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/json-language-features/server/src/jsonServer.ts b/extensions/json-language-features/server/src/jsonServer.ts
index d88b80587dc..9b353d913ed 100644
--- a/extensions/json-language-features/server/src/jsonServer.ts
+++ b/extensions/json-language-features/server/src/jsonServer.ts
@@ -429,7 +429,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		return runSafeAsync(runtime, async () => {
 			const document = documents.get(codeActionParams.textDocument.uri);
 			if (document) {
-				const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source);
+				const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source.concat('.sort', '.json'));
 				sortCodeAction.command = {
 					command: 'json.sort',
 					title: 'Sort JSON'

From eec2fc723c952f18c7ca0005c2bcf8840c819d38 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Thu, 31 Aug 2023 13:10:26 -0700
Subject: [PATCH 13/94] Disable Local Server flow for REH (#191930)

Because spinning up ports on the remote won't always work. Instead, we have the trusty device code flow.

Fixes https://github.com/microsoft/vscode/issues/191866
Fixes https://github.com/microsoft/vscode/issues/191867
---
 extensions/github-authentication/src/flows.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/github-authentication/src/flows.ts b/extensions/github-authentication/src/flows.ts
index 5bc9d095385..1e988d92d30 100644
--- a/extensions/github-authentication/src/flows.ts
+++ b/extensions/github-authentication/src/flows.ts
@@ -200,7 +200,9 @@ const allFlows: IFlow[] = [
 			// other flows that work well.
 			supportsGitHubEnterpriseServer: false,
 			supportsHostedGitHubEnterprise: true,
-			supportsRemoteExtensionHost: true,
+			// Opening a port on the remote side can't be open in the browser on
+			// the client side so this flow won't work in remote extension hosts
+			supportsRemoteExtensionHost: false,
 			// Web worker can't open a port to listen for the redirect
 			supportsWebWorkerExtensionHost: false,
 			// exchanging a code for a token requires a client secret

From 065d4c1e23b278e2a277e80b23c07627b0efa4eb Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Thu, 31 Aug 2023 14:28:15 -0700
Subject: [PATCH 14/94] Do not show parent checkbox contents for ai generated
 workspaces (#191933)

---
 .../contrib/workspace/browser/workspace.contribution.ts  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
index 077b248bc0f..864a19e1ce4 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
@@ -311,13 +311,12 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
 		this._register(this.workspaceTrustRequestService.onDidInitiateWorkspaceTrustRequestOnStartup(async () => {
 
 			let titleString: string | undefined;
-			let checkboxString: string | undefined;
 			let learnMoreString: string | undefined;
 			let trustOption: string | undefined;
 			let dontTrustOption: string | undefined;
-			if (await this.isAiGeneratedWorkspace() && this.productService.aiGeneratedWorkspaceTrust) {
+			const isAiGeneratedWorkspace = await this.isAiGeneratedWorkspace();
+			if (isAiGeneratedWorkspace && this.productService.aiGeneratedWorkspaceTrust) {
 				titleString = this.productService.aiGeneratedWorkspaceTrust.title;
-				checkboxString = this.productService.aiGeneratedWorkspaceTrust.checkboxText;
 				learnMoreString = this.productService.aiGeneratedWorkspaceTrust.startupTrustRequestLearnMore;
 				trustOption = this.productService.aiGeneratedWorkspaceTrust.trustOption;
 				dontTrustOption = this.productService.aiGeneratedWorkspaceTrust.dontTrustOption;
@@ -333,9 +332,9 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
 			const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace());
 			const isSingleFolderWorkspace = isSingleFolderWorkspaceIdentifier(workspaceIdentifier);
 			const isEmptyWindow = isEmptyWorkspaceIdentifier(workspaceIdentifier);
-			if (this.workspaceTrustManagementService.canSetParentFolderTrust()) {
+			if (!isAiGeneratedWorkspace && this.workspaceTrustManagementService.canSetParentFolderTrust()) {
 				const name = basename(uriDirname((workspaceIdentifier as ISingleFolderWorkspaceIdentifier).uri));
-				checkboxText = checkboxString ?? localize('checkboxString', "Trust the authors of all files in the parent folder '{0}'", name);
+				checkboxText = localize('checkboxString', "Trust the authors of all files in the parent folder '{0}'", name);
 			}
 
 			// Show Workspace Trust Start Dialog

From 79277e0b8f045483a49f8a6834d476410c0d3cba Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Thu, 31 Aug 2023 14:34:22 -0700
Subject: [PATCH 15/94] Skip flakey smoke test (#191936)

* Skip flakey smoke test

ref https://github.com/microsoft/vscode/issues/191860

* skip at describe since there's only 1 test
---
 test/smoke/src/areas/extensions/extensions.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts
index 7a4875bcd7f..a8120cb12bf 100644
--- a/test/smoke/src/areas/extensions/extensions.test.ts
+++ b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -7,7 +7,7 @@ import { Application, Logger } from '../../../../automation';
 import { installAllHandlers } from '../../utils';
 
 export function setup(logger: Logger) {
-	describe('Extensions', () => {
+	describe.skip('Extensions', () => {
 
 		// Shared before/after handling
 		installAllHandlers(logger);

From 4c6dbcf90f338caae79babdf8d48e6524a86fbe7 Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Thu, 31 Aug 2023 15:28:39 -0700
Subject: [PATCH 16/94] Add check to see if resource has file extension before
 setting FILE | FOLDER (#191923)

* Set resource as FILE only if children are undefined

* Add check to see if resource has extension before setting FileKind
---
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 8ba6d711809..4bfefbd3af3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -1200,7 +1200,8 @@ class ChatListTreeRenderer implements ICompressibleTreeRenderer<IChatResponsePro
 	}
 	renderElement(element: ITreeNode<IChatResponseProgressFileTreeData, void>, index: number, templateData: IChatListTreeRendererTemplate, height: number | undefined): void {
 		templateData.label.element.style.display = 'flex';
-		if (!element.children.length) {
+		const hasExtension = /\.[^/.]+$/.test(element.element.label);
+		if (!element.children.length && hasExtension) {
 			templateData.label.setFile(element.element.uri, {
 				fileKind: FileKind.FILE,
 				hidePath: true,

From 8f33e459f6af6c408655a1875c3475e71f45993f Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Thu, 31 Aug 2023 15:51:04 -0700
Subject: [PATCH 17/94] Only update layout when chat is visible (#191943)

Fixes https://github.com/microsoft/vscode/issues/191942
---
 src/vs/workbench/contrib/chat/browser/chatQuick.ts | 14 +++++++++++++-
 .../workbench/contrib/chat/browser/chatWidget.ts   | 11 +++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatQuick.ts b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
index 32592d223ab..5c41a1a6f7e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuick.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
@@ -134,6 +134,7 @@ class QuickChat extends Disposable {
 	private model: ChatModel | undefined;
 	private _currentQuery: string | undefined;
 	private maintainScrollTimer: MutableDisposable<IDisposable> = this._register(new MutableDisposable<IDisposable>());
+	private _deferUpdatingDynamicLayout: boolean = false;
 
 	constructor(
 		private readonly _options: IChatViewOptions,
@@ -183,6 +184,10 @@ class QuickChat extends Disposable {
 		this.widget.setVisible(true);
 		// If the mutable disposable is set, then we are keeping the existing scroll position
 		// so we should not update the layout.
+		if (this._deferUpdatingDynamicLayout) {
+			this._deferUpdatingDynamicLayout = false;
+			this.widget.updateDynamicChatTreeItemLayout(2, this.maxHeight);
+		}
 		if (!this.maintainScrollTimer.value) {
 			this.widget.layoutDynamicChatTreeItemMode();
 		}
@@ -222,7 +227,14 @@ class QuickChat extends Disposable {
 
 	private registerListeners(parent: HTMLElement): void {
 		this._register(this.layoutService.onDidLayout(() => {
-			this.widget.updateDynamicChatTreeItemLayout(2, this.maxHeight);
+			if (this.widget.visible) {
+				this.widget.updateDynamicChatTreeItemLayout(2, this.maxHeight);
+			} else {
+				// If the chat is not visible, then we should defer updating the layout
+				// because it relies on offsetHeight which only works correctly
+				// when the chat is visible.
+				this._deferUpdatingDynamicLayout = true;
+			}
 		}));
 		this._register(this.widget.inputEditor.onDidChangeModelContent((e) => {
 			this._currentQuery = this.widget.inputEditor.getValue();
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index b37163a9990..91c15635f2e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -77,9 +77,12 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	private container!: HTMLElement;
 
 	private bodyDimension: dom.Dimension | undefined;
-	private visible = false;
 	private visibleChangeCount = 0;
 	private requestInProgress: IContextKey<boolean>;
+	private _visible = false;
+	public get visible() {
+		return this._visible;
+	}
 
 	private previousTreeScrollHeight: number = 0;
 
@@ -214,7 +217,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	}
 
 	private onDidChangeItems(skipDynamicLayout?: boolean) {
-		if (this.tree && this.visible) {
+		if (this.tree && this._visible) {
 			const treeItems = (this.viewModel?.getItems() ?? [])
 				.map(item => {
 					return <ITreeElement<ChatTreeItem>>{
@@ -261,7 +264,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	}
 
 	setVisible(visible: boolean): void {
-		this.visible = visible;
+		this._visible = visible;
 		this.visibleChangeCount++;
 		this.renderer.setVisible(visible);
 
@@ -269,7 +272,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this._register(disposableTimeout(() => {
 				// Progressive rendering paused while hidden, so start it up again.
 				// Do it after a timeout because the container is not visible yet (it should be but offsetHeight returns 0 here)
-				if (this.visible) {
+				if (this._visible) {
 					this.onDidChangeItems(true);
 				}
 			}, 0));

From ee08fd53cc990f4e8abaabf6e8014b3208128771 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Thu, 31 Aug 2023 15:52:13 -0700
Subject: [PATCH 18/94] Don't show chat widget context menu for filetree
 (#191940)

---
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 4bfefbd3af3..ebb17cc541f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -539,6 +539,10 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		treeDisposables.add(tree.onDidChangeCollapseState(() => {
 			this._onDidChangeItemHeight.fire({ element, height: templateData.rowContainer.offsetHeight });
 		}));
+		treeDisposables.add(tree.onContextMenu((e) => {
+			e.browserEvent.preventDefault();
+			e.browserEvent.stopPropagation();
+		}));
 
 		tree.setInput(data).then(() => {
 			if (!ref.isStale()) {

From dd112ec0243c4b42bb3106e64df1688e242a6559 Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Thu, 31 Aug 2023 16:37:56 -0700
Subject: [PATCH 19/94] Open walkthrough if a gettingStarted page is found
 (#191947)

---
 .../browser/gettingStarted.contribution.ts               | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
index a6da647dbcc..1e57d47d68a 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
@@ -66,10 +66,8 @@ registerAction2(class extends Action2 {
 			// Try first to select the walkthrough on an active welcome page with no selected walkthrough
 			for (const group of editorGroupsService.groups) {
 				if (group.activeEditor instanceof GettingStartedInput) {
-					if (!group.activeEditor.selectedCategory) {
-						(group.activeEditorPane as GettingStartedPage).makeCategoryVisibleWhenAvailable(selectedCategory, selectedStep);
-						return;
-					}
+					(group.activeEditorPane as GettingStartedPage).makeCategoryVisibleWhenAvailable(selectedCategory, selectedStep);
+					return;
 				}
 			}
 
@@ -106,7 +104,10 @@ registerAction2(class extends Action2 {
 				editorService.openEditor({
 					resource: GettingStartedInput.RESOURCE,
 					options: <GettingStartedEditorOptions>{ selectedCategory: selectedCategory, selectedStep: selectedStep, preserveFocus: toSide ?? false }
+				}).then((editor) => {
+					(editor as GettingStartedPage)?.makeCategoryVisibleWhenAvailable(selectedCategory, selectedStep);
 				});
+
 			}
 		} else {
 			editorService.openEditor({ resource: GettingStartedInput.RESOURCE });

From 5f7b620db8ec603453798554a6596a7ad608fb3e Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Fri, 1 Sep 2023 15:32:05 +0900
Subject: [PATCH 20/94] chore: bump electron@25.8.0 (#191905)

* chore: bump electron@25.8.0

* chore: update internal build id

* chore: bump distro
---
 .yarnrc                      |  4 +--
 build/checksums/electron.txt | 54 ++++++++++++++++++------------------
 cgmanifest.json              |  4 +--
 package.json                 |  4 +--
 yarn.lock                    |  8 +++---
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.yarnrc b/.yarnrc
index 7b3fff4b526..fff0be195f2 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,5 +1,5 @@
 disturl "https://electronjs.org/headers"
-target "25.7.0"
-ms_build_id "23434598"
+target "25.8.0"
+ms_build_id "23503258"
 runtime "electron"
 build_from_source "true"
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index a19497f08e8..9c46b2ad8ef 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,27 +1,27 @@
-efbcf77eb1a0783766f9579ffb9f9b68f04fea8cb091eab7ab8484ba0cd13fbf *electron-v25.7.0-darwin-arm64-symbols.zip
-76a415165d212a345a5689de83078adc715fc10562bfaa35d7323094780ba683 *electron-v25.7.0-darwin-arm64.zip
-07b9049848e877019d1dce71e06713125b605dda8ac5d0b8ab3aa899cf40551d *electron-v25.7.0-darwin-x64-symbols.zip
-dea726ae9adc1c36206ce8d20ce32f630bcd684b869e0cb302f97c8bd26616d6 *electron-v25.7.0-darwin-x64.zip
-b6c8ba123353984b2d3ffd6ccd52aec2d3238f71611c4c94bab75aa92804eebf *electron-v25.7.0-linux-arm64-symbols.zip
-19e1e2c7ea1ab024f069e3dad6a26605e14b2c605e134484196343118fccf925 *electron-v25.7.0-linux-arm64.zip
-ba0bbe84ea626c8064809c66487a3b77ad39bcf8b1daa0d9421428f78ad4d665 *electron-v25.7.0-linux-armv7l-symbols.zip
-832a68cddb20eb847aca982b89f89e145f50dd483c71c8a705bbb9248fb7c665 *electron-v25.7.0-linux-armv7l.zip
-2e616b446112533d3aa69ed1074ab1e0be5400996129aa636273d01462dc9506 *electron-v25.7.0-linux-x64-symbols.zip
-002641e8103b77060e23b9c77c51ffb942372d01306210cdc3d32fc6ae5d112b *electron-v25.7.0-linux-x64.zip
-162e0f7ca9fc1c17b8d84e9b9eccc65bb0f527a67f6339a19292d798085848e4 *electron-v25.7.0-win32-arm64-pdb.zip
-7d98734ffcf10e1d002c30a212dd1f203b1418a295da67410490f83e9ced388c *electron-v25.7.0-win32-arm64-symbols.zip
-9777d47f74d129f7c68ebffad640a6a527b83895c173c7d344f80fc9588bad85 *electron-v25.7.0-win32-arm64.zip
-c805c6356378dccb21b5725004934534e187bdaf8149a6a457fdd60d243b41e4 *electron-v25.7.0-win32-ia32-pdb.zip
-5f1a3b09153cf934f24f3b1853ad1788e7c27c6ddceb80e52fe07e2e69b6bb2b *electron-v25.7.0-win32-ia32-symbols.zip
-fdf8e100c3d3cdb75b54ced1ecae96d6206eca08ebb07c5d8f08740e5e703509 *electron-v25.7.0-win32-ia32.zip
-aa56314a675351e9457355f2cb0660c62a3be62cc340dad76fd216741064824d *electron-v25.7.0-win32-x64-pdb.zip
-25d664dfe0823e1a12269feb6eb3886dba44b2d130b8787c4d58d3d0cbcf1c22 *electron-v25.7.0-win32-x64-symbols.zip
-7ddb0b38207fd837cdf4e2b2778c365751315e321b09d346c8bb8476300d0ec0 *electron-v25.7.0-win32-x64.zip
-02619733aadb13b6bf21df966e04775506d0d7595a0795003fed45631c4a0af6 *ffmpeg-v25.7.0-darwin-arm64.zip
-69a8e2021e48f504021913c15633cbef2b4a7b28656c51cd238acdbf7c94e358 *ffmpeg-v25.7.0-darwin-x64.zip
-bd52d57ff97fb56ac01a3482af905d04f0d4e9c13c53858c6d9f99957eca82da *ffmpeg-v25.7.0-linux-arm64.zip
-9b3d09177fa1e63e2a6beecfa70aeec30aeb5c1873ff21128a68051c4e23f95d *ffmpeg-v25.7.0-linux-armv7l.zip
-edc7b1c9f1a0733f109a2c0375a4e40c5bfe0bf28b7f06dcc76e1ada0aa2f125 *ffmpeg-v25.7.0-linux-x64.zip
-7076d4593f2e2e2abf0dc9ad8f6490d72b2fa89710def822f39da4363e49e504 *ffmpeg-v25.7.0-win32-arm64.zip
-bd07183c1b6a93586d73c4106ceef0faae77f46763d15d6901d5954c2c5bba1b *ffmpeg-v25.7.0-win32-ia32.zip
-b056e71a7c59441c551d5bbc1a8d99f2464a5809a3ba17d41540dc7174cab7b7 *ffmpeg-v25.7.0-win32-x64.zip
+88cafda8394985e59d3d84cb4a6692ad04d8e32db9ecd6429e748e41526ddad7 *electron-v25.8.0-darwin-arm64-symbols.zip
+6e33d3b8041561722ed41777e055a8c15d3f4e61b67367b2618918bcf0cfea76 *electron-v25.8.0-darwin-arm64.zip
+438ac9915e062a239fb6d2595323c4783d2c820efc9cbcf3d2c1253d0e057e83 *electron-v25.8.0-darwin-x64-symbols.zip
+798907d2a66bc79202c8213c61e7fd147ae2a8c31c485d814950b11d43bbbba8 *electron-v25.8.0-darwin-x64.zip
+3243f3764319cff6c942d9f90a86323c36ec05ec51ef01e782c4e9a7194187e1 *electron-v25.8.0-linux-arm64-symbols.zip
+f24f858b76bf8a2e18419f62e0f891712b2fa541089123e9caa8d5cd67fc3276 *electron-v25.8.0-linux-arm64.zip
+dc3ff0489a0ebeda56d06b31eeae75dd7321a52bb601069c4475c56462b4814a *electron-v25.8.0-linux-armv7l-symbols.zip
+3b7a0c3899f828a5cf30043b73992e90231400b90c1afa700a44f892a55e326b *electron-v25.8.0-linux-armv7l.zip
+44803b2487406eca8fff9cec405e9e50bd92a911808dfaaa523b9ef52a0e72d8 *electron-v25.8.0-linux-x64-symbols.zip
+d54fb2df0ad7318240220aa26327171ed1e891fb296f3c27c58b8b487c4df8eb *electron-v25.8.0-linux-x64.zip
+bf7be6c0c8d0df06f0ce22e16c97aea823415d7f5cbf0ffdadf65d75feaf3cd8 *electron-v25.8.0-win32-arm64-pdb.zip
+5d91757660b44bf30907f9c2b52225ade4d127d0fe48dc83dec134cc06c949f0 *electron-v25.8.0-win32-arm64-symbols.zip
+d1e6f30a8d8c7aed28d08ddf915d79de6b16b3a0a7c84c45fd3cc0d47f2b7f53 *electron-v25.8.0-win32-arm64.zip
+e389fef61c14ea0eefad91a9725aa0afd4dbdc982f7b30aba97bd9c2871c2061 *electron-v25.8.0-win32-ia32-pdb.zip
+374d6c8897f97fab04e990ecf928e05f643ae33801546bf7d39bf4045b9d8b52 *electron-v25.8.0-win32-ia32-symbols.zip
+73fc3382202b70dcaf7928f09a791662de82c701b8f403ed72cc5aa9b1401593 *electron-v25.8.0-win32-ia32.zip
+010d248bd2e77585e1fa977e58b016659566de5a91c1e6845c85a7e6e1851bb9 *electron-v25.8.0-win32-x64-pdb.zip
+72adb74fd92edff35c177c3c5d96765f230bc7adb8af11b30d5122b9e54c26e1 *electron-v25.8.0-win32-x64-symbols.zip
+0051d0f241aedc6cdab4751c60f48758936122796f06c9e3033c7710a531686c *electron-v25.8.0-win32-x64.zip
+2956915642c45eb0099228368d0af50e891e4c10014fa4d3d3bcfb135fbb89a7 *ffmpeg-v25.8.0-darwin-arm64.zip
+099ee69d44f8ac3802cdd612895f279f7adb043a5b9c9d123479b0f96514a44c *ffmpeg-v25.8.0-darwin-x64.zip
+bd52d57ff97fb56ac01a3482af905d04f0d4e9c13c53858c6d9f99957eca82da *ffmpeg-v25.8.0-linux-arm64.zip
+9b3d09177fa1e63e2a6beecfa70aeec30aeb5c1873ff21128a68051c4e23f95d *ffmpeg-v25.8.0-linux-armv7l.zip
+edc7b1c9f1a0733f109a2c0375a4e40c5bfe0bf28b7f06dcc76e1ada0aa2f125 *ffmpeg-v25.8.0-linux-x64.zip
+a58e9480dab981ff973749e9d1e08936b2dd63a4b7f9523c030b1833387a4eb5 *ffmpeg-v25.8.0-win32-arm64.zip
+6866b23a4d561c0322aeb7690aae646718c54398739946e352bf80d0dd721bfd *ffmpeg-v25.8.0-win32-ia32.zip
+7b906df4ad6252881cf1e58619285b624f74d593379fbc6728e238b852d6abad *ffmpeg-v25.8.0-win32-x64.zip
diff --git a/cgmanifest.json b/cgmanifest.json
index df2f75f3209..6b2d2bfff44 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "f818ec3295c9688585e3cfea532ccc5b705746bb"
+					"commitHash": "84d7f7f071ae11637d4a41b95536410293672750"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "25.7.0"
+			"version": "25.8.0"
 		},
 		{
 			"component": {
diff --git a/package.json b/package.json
index 1a58592be0a..997a4931166 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.82.0",
-  "distro": "021e674d5265eb9125cfc0282c3a9a6091f4982d",
+  "distro": "0a5805caff2d59440704a3bf75eebaa509be862f",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -150,7 +150,7 @@
     "cssnano": "^4.1.11",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "25.7.0",
+    "electron": "25.8.0",
     "eslint": "8.36.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^39.3.2",
diff --git a/yarn.lock b/yarn.lock
index e171d0e0f55..aac325ba08f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3587,10 +3587,10 @@ electron-to-chromium@^1.4.202:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.207.tgz#9c3310ebace2952903d05dcaba8abe3a4ed44c01"
   integrity sha512-piH7MJDJp4rJCduWbVvmUd59AUne1AFBJ8JaRQvk0KzNTSUnZrVXHCZc+eg+CGE4OujkcLJznhGKD6tuAshj5Q==
 
-electron@25.7.0:
-  version "25.7.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-25.7.0.tgz#0076c2e6acfe363f666a7b77d826a6f8a3028bcd"
-  integrity sha512-P82EzYZ8k9J21x5syhXV7EkezDmEXwycReXnagfzS0kwepnrlWzq1aDIUWdNvzTdHobky4m/nYcL98qd73mEVA==
+electron@25.8.0:
+  version "25.8.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.0.tgz#60c84f1f256924ac5a0aff13276b901b0c43767a"
+  integrity sha512-T3kC1a/3ntSaYMCVVfUUc9v7myPzi6J2GP0Ad/CyfWKDPp054dGyKxb2EEjKnxQQ7wfjsT1JTEdBG04x6ekVBw==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"

From a5f4583b51a2d181a7495b7344d9ef90ee3fc2f8 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Fri, 1 Sep 2023 09:41:12 +0200
Subject: [PATCH 21/94] 1.83.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 997a4931166..dfd24be8535 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "code-oss-dev",
-  "version": "1.82.0",
+  "version": "1.83.0",
   "distro": "0a5805caff2d59440704a3bf75eebaa509be862f",
   "author": {
     "name": "Microsoft Corporation"

From 2ed3ef258820640f4bffbdd26c3393edc14910ac Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 1 Sep 2023 10:32:59 +0200
Subject: [PATCH 22/94] editors - do not focus empty editor group when created
 (#191966)

---
 src/vs/workbench/browser/parts/editor/editorActions.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index 149b76d8df9..e13b41e522f 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -2264,8 +2264,12 @@ abstract class AbstractCreateEditorGroupAction extends Action2 {
 	override async run(accessor: ServicesAccessor): Promise<void> {
 		const editorGroupService = accessor.get(IEditorGroupsService);
 
-		const group = editorGroupService.addGroup(editorGroupService.activeGroup, this.direction, { activate: true });
-		group.focus();
+		// We intentionally do not want the new group to be focussed so that
+		// a user can have keyboard focus e.g. in a tree/list, open a new
+		// editor group that is active and then arrow-up/down in the tree/list
+		// to pick an editor to open in that group
+
+		editorGroupService.addGroup(editorGroupService.activeGroup, this.direction, { activate: true });
 	}
 }
 

From e4a24b361aae8b1fa2d6513b46c7fa10f90d30cd Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 1 Sep 2023 11:41:21 +0200
Subject: [PATCH 23/94] Enable the family autodetection algorithm (#191971)

Fixes #191945: Enable the family autodetection algorithm to support a case where localhost resolves first to the ipv6 address and only second to the ipv4 address, and the desired server listens only on ipv4
---
 src/vs/server/node/remoteExtensionHostAgentServer.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/server/node/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts
index 5a2d9943ac9..d1a0f51e783 100644
--- a/src/vs/server/node/remoteExtensionHostAgentServer.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts
@@ -551,7 +551,8 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 			const socket = net.createConnection(
 				{
 					host: host,
-					port: port
+					port: port,
+					autoSelectFamily: true
 				}, () => {
 					socket.removeListener('error', e);
 					socket.pause();

From 2c021905ad67daf18551e06661f86a76e2c64129 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 1 Sep 2023 13:40:20 +0200
Subject: [PATCH 24/94] Do not repaint decorations overview ruler if it is not
 necessary (#191931)

Fixes #191423: Do not repaint decorations overview ruler if it is not necessary
---
 .../overviewRuler/decorationsOverviewRuler.ts | 57 ++++++++++++++++---
 src/vs/editor/common/viewModel.ts             | 12 ++++
 2 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
index 86db61f97e1..31e38a56c4d 100644
--- a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
+++ b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
@@ -17,6 +17,7 @@ import { EditorTheme } from 'vs/editor/common/editorTheme';
 import * as viewEvents from 'vs/editor/common/viewEvents';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { OverviewRulerDecorationsGroup } from 'vs/editor/common/viewModel';
+import { equals } from 'vs/base/common/arrays';
 
 class Settings {
 
@@ -212,13 +213,24 @@ const enum OverviewRulerLane {
 	Full = 7
 }
 
+const enum ShouldRenderValue {
+	NotNeeded = 0,
+	Maybe = 1,
+	Needed = 2
+}
+
 export class DecorationsOverviewRuler extends ViewPart {
 
+	private _actualShouldRender: ShouldRenderValue = ShouldRenderValue.NotNeeded;
+
 	private readonly _tokensColorTrackerListener: IDisposable;
 	private readonly _domNode: FastDomNode<HTMLCanvasElement>;
 	private _settings!: Settings;
 	private _cursorPositions: Position[];
 
+	private _renderedDecorations: OverviewRulerDecorationsGroup[] = [];
+	private _renderedCursorPositions: Position[] = [];
+
 	constructor(context: ViewContext) {
 		super(context);
 
@@ -270,8 +282,18 @@ export class DecorationsOverviewRuler extends ViewPart {
 
 	// ---- begin view event handlers
 
+	private _markRenderingIsNeeded(): true {
+		this._actualShouldRender = ShouldRenderValue.Needed;
+		return true;
+	}
+
+	private _markRenderingIsMaybeNeeded(): true {
+		this._actualShouldRender = ShouldRenderValue.Maybe;
+		return true;
+	}
+
 	public override onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
-		return this._updateSettings(false);
+		return this._updateSettings(false) ? this._markRenderingIsNeeded() : false;
 	}
 	public override onCursorStateChanged(e: viewEvents.ViewCursorStateChangedEvent): boolean {
 		this._cursorPositions = [];
@@ -279,25 +301,25 @@ export class DecorationsOverviewRuler extends ViewPart {
 			this._cursorPositions[i] = e.selections[i].getPosition();
 		}
 		this._cursorPositions.sort(Position.compare);
-		return true;
+		return this._markRenderingIsMaybeNeeded();
 	}
 	public override onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		if (e.affectsOverviewRuler) {
-			return true;
+			return this._markRenderingIsMaybeNeeded();
 		}
 		return false;
 	}
 	public override onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
-		return true;
+		return this._markRenderingIsNeeded();
 	}
 	public override onScrollChanged(e: viewEvents.ViewScrollChangedEvent): boolean {
-		return e.scrollHeightChanged;
+		return e.scrollHeightChanged ? this._markRenderingIsNeeded() : false;
 	}
 	public override onZonesChanged(e: viewEvents.ViewZonesChangedEvent): boolean {
-		return true;
+		return this._markRenderingIsNeeded();
 	}
 	public override onThemeChanged(e: viewEvents.ViewThemeChangedEvent): boolean {
-		return this._updateSettings(false);
+		return this._updateSettings(false) ? this._markRenderingIsNeeded() : false;
 	}
 
 	// ---- end view event handlers
@@ -312,6 +334,7 @@ export class DecorationsOverviewRuler extends ViewPart {
 
 	public render(editorCtx: RestrictedRenderingContext): void {
 		this._render();
+		this._actualShouldRender = ShouldRenderValue.NotNeeded;
 	}
 
 	private _render(): void {
@@ -322,6 +345,23 @@ export class DecorationsOverviewRuler extends ViewPart {
 			this._domNode.setDisplay('none');
 			return;
 		}
+
+		const decorations = this._context.viewModel.getAllOverviewRulerDecorations(this._context.theme);
+		decorations.sort(OverviewRulerDecorationsGroup.cmp);
+
+		if (this._actualShouldRender === ShouldRenderValue.Maybe && !OverviewRulerDecorationsGroup.equalsArr(this._renderedDecorations, decorations)) {
+			this._actualShouldRender = ShouldRenderValue.Needed;
+		}
+		if (this._actualShouldRender === ShouldRenderValue.Maybe && !equals(this._renderedCursorPositions, this._cursorPositions, (a, b) => a.lineNumber === b.lineNumber)) {
+			this._actualShouldRender = ShouldRenderValue.Needed;
+		}
+		if (this._actualShouldRender === ShouldRenderValue.Maybe) {
+			// both decorations and cursor positions are unchanged, nothing to do
+			return;
+		}
+		this._renderedDecorations = decorations;
+		this._renderedCursorPositions = this._cursorPositions;
+
 		this._domNode.setDisplay('block');
 		const canvasWidth = this._settings.canvasWidth;
 		const canvasHeight = this._settings.canvasHeight;
@@ -329,7 +369,6 @@ export class DecorationsOverviewRuler extends ViewPart {
 		const viewLayout = this._context.viewLayout;
 		const outerHeight = this._context.viewLayout.getScrollHeight();
 		const heightRatio = canvasHeight / outerHeight;
-		const decorations = this._context.viewModel.getAllOverviewRulerDecorations(this._context.theme);
 
 		const minDecorationHeight = (Constants.MIN_DECORATION_HEIGHT * this._settings.pixelRatio) | 0;
 		const halfMinDecorationHeight = (minDecorationHeight / 2) | 0;
@@ -355,7 +394,7 @@ export class DecorationsOverviewRuler extends ViewPart {
 		const x = this._settings.x;
 		const w = this._settings.w;
 
-		decorations.sort(OverviewRulerDecorationsGroup.cmp);
+
 
 		for (const decorationGroup of decorations) {
 			const color = decorationGroup.color;
diff --git a/src/vs/editor/common/viewModel.ts b/src/vs/editor/common/viewModel.ts
index e61ba01dc15..4e4b4d3032f 100644
--- a/src/vs/editor/common/viewModel.ts
+++ b/src/vs/editor/common/viewModel.ts
@@ -445,4 +445,16 @@ export class OverviewRulerDecorationsGroup {
 		}
 		return a.zIndex - b.zIndex;
 	}
+
+	public static equalsArr(a: OverviewRulerDecorationsGroup[], b: OverviewRulerDecorationsGroup[]): boolean {
+		if (a.length !== b.length) {
+			return false;
+		}
+		for (let i = 0, len = a.length; i < len; i++) {
+			if (OverviewRulerDecorationsGroup.cmp(a[i], b[i]) !== 0) {
+				return false;
+			}
+		}
+		return true;
+	}
 }

From 02ddb145e8ae681362607bc76291fe9b8135c75b Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 1 Sep 2023 14:10:57 +0200
Subject: [PATCH 25/94] additing translation l10n

---
 extensions/json-language-features/server/src/jsonServer.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/json-language-features/server/src/jsonServer.ts b/extensions/json-language-features/server/src/jsonServer.ts
index 9b353d913ed..36ca0dc591d 100644
--- a/extensions/json-language-features/server/src/jsonServer.ts
+++ b/extensions/json-language-features/server/src/jsonServer.ts
@@ -14,6 +14,7 @@ import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnostics
 import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions } from 'vscode-json-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
 import { Utils, URI } from 'vscode-uri';
+import * as l10n from '@vscode/l10n';
 
 type ISchemaAssociations = Record<string, string[]>;
 
@@ -432,7 +433,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 				const sortCodeAction = CodeAction.create('Sort JSON', CodeActionKind.Source.concat('.sort', '.json'));
 				sortCodeAction.command = {
 					command: 'json.sort',
-					title: 'Sort JSON'
+					title: l10n.t('Sort JSON')
 				};
 				return [sortCodeAction];
 			}

From 415bc174ea00a7bbda4ca709e8dd86dd36a16336 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Fri, 1 Sep 2023 14:23:16 +0200
Subject: [PATCH 26/94] refine lint config, add missing jsdoc and jsdoc-tag
 corrections

---
 .eslintrc.json             |   10 +-
 src/vscode-dts/vscode.d.ts | 1435 ++++++++++++++++++++++++++++--------
 2 files changed, 1141 insertions(+), 304 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index b2c303da84a..f44673cd1cd 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -201,9 +201,6 @@
 				"**/vscode.d.ts"
 			],
 			"rules": {
-				"extends": [
-					"plugin:jsdoc/recommended-typescript"
-				],
 				"jsdoc/tag-lines": "off",
 				"jsdoc/valid-types": "off",
 				"jsdoc/no-multi-asterisks": [
@@ -220,6 +217,7 @@
 							"TSInterfaceDeclaration",
 							"TSPropertySignature",
 							"TSMethodSignature",
+							"TSDeclareFunction",
 							"ClassDeclaration",
 							"MethodDefinition",
 							"PropertyDeclaration",
@@ -232,9 +230,11 @@
 				"jsdoc/check-param-names": [
 					"warn",
 					{
-						"enableFixer": false
+						"enableFixer": false,
+						"checkDestructured": false
 					}
-				]
+				],
+				"jsdoc/require-returns": "warn"
 			}
 		},
 		{
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 4f5c61daaa7..97f52cb344d 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -136,7 +136,7 @@ declare module 'vscode' {
 		/**
 		 * Save the underlying file.
 		 *
-		 * @return A promise that will resolve to `true` when the file
+		 * @returns A promise that will resolve to `true` when the file
 		 * has been saved. If the save failed, will return `false`.
 		 */
 		save(): Thenable<boolean>;
@@ -158,7 +158,7 @@ declare module 'vscode' {
 		 * document are not reflected.
 		 *
 		 * @param line A line number in [0, lineCount).
-		 * @return A {@link TextLine line}.
+		 * @returns A {@link TextLine line}.
 		 */
 		lineAt(line: number): TextLine;
 
@@ -172,7 +172,7 @@ declare module 'vscode' {
 		 * @see {@link TextDocument.lineAt}
 		 *
 		 * @param position A position.
-		 * @return A {@link TextLine line}.
+		 * @returns A {@link TextLine line}.
 		 */
 		lineAt(position: Position): TextLine;
 
@@ -182,7 +182,7 @@ declare module 'vscode' {
 		 * The position will be {@link TextDocument.validatePosition adjusted}.
 		 *
 		 * @param position A position.
-		 * @return A valid zero-based offset.
+		 * @returns A valid zero-based offset.
 		 */
 		offsetAt(position: Position): number;
 
@@ -190,7 +190,7 @@ declare module 'vscode' {
 		 * Converts a zero-based offset to a position.
 		 *
 		 * @param offset A zero-based offset.
-		 * @return A valid {@link Position}.
+		 * @returns A valid {@link Position}.
 		 */
 		positionAt(offset: number): Position;
 
@@ -199,7 +199,7 @@ declare module 'vscode' {
 		 * a range. The range will be {@link TextDocument.validateRange adjusted}.
 		 *
 		 * @param range Include only the text included by the range.
-		 * @return The text inside the provided range or the entire text.
+		 * @returns The text inside the provided range or the entire text.
 		 */
 		getText(range?: Range): string;
 
@@ -219,7 +219,7 @@ declare module 'vscode' {
 		 *
 		 * @param position A position.
 		 * @param regex Optional regular expression that describes what a word is.
-		 * @return A range spanning a word, or `undefined`.
+		 * @returns A range spanning a word, or `undefined`.
 		 */
 		getWordRangeAtPosition(position: Position, regex?: RegExp): Range | undefined;
 
@@ -227,7 +227,7 @@ declare module 'vscode' {
 		 * Ensure a range is completely contained in this document.
 		 *
 		 * @param range A range.
-		 * @return The given range or a new, adjusted range.
+		 * @returns The given range or a new, adjusted range.
 		 */
 		validateRange(range: Range): Range;
 
@@ -235,7 +235,7 @@ declare module 'vscode' {
 		 * Ensure a position is contained in the range of this document.
 		 *
 		 * @param position A position.
-		 * @return The given position or a new, adjusted position.
+		 * @returns The given position or a new, adjusted position.
 		 */
 		validatePosition(position: Position): Position;
 	}
@@ -270,7 +270,7 @@ declare module 'vscode' {
 		 * Check if this position is before `other`.
 		 *
 		 * @param other A position.
-		 * @return `true` if position is on a smaller line
+		 * @returns `true` if position is on a smaller line
 		 * or on the same line on a smaller character.
 		 */
 		isBefore(other: Position): boolean;
@@ -279,7 +279,7 @@ declare module 'vscode' {
 		 * Check if this position is before or equal to `other`.
 		 *
 		 * @param other A position.
-		 * @return `true` if position is on a smaller line
+		 * @returns `true` if position is on a smaller line
 		 * or on the same line on a smaller or equal character.
 		 */
 		isBeforeOrEqual(other: Position): boolean;
@@ -288,7 +288,7 @@ declare module 'vscode' {
 		 * Check if this position is after `other`.
 		 *
 		 * @param other A position.
-		 * @return `true` if position is on a greater line
+		 * @returns `true` if position is on a greater line
 		 * or on the same line on a greater character.
 		 */
 		isAfter(other: Position): boolean;
@@ -297,7 +297,7 @@ declare module 'vscode' {
 		 * Check if this position is after or equal to `other`.
 		 *
 		 * @param other A position.
-		 * @return `true` if position is on a greater line
+		 * @returns `true` if position is on a greater line
 		 * or on the same line on a greater or equal character.
 		 */
 		isAfterOrEqual(other: Position): boolean;
@@ -306,7 +306,7 @@ declare module 'vscode' {
 		 * Check if this position is equal to `other`.
 		 *
 		 * @param other A position.
-		 * @return `true` if the line and character of the given position are equal to
+		 * @returns `true` if the line and character of the given position are equal to
 		 * the line and character of this position.
 		 */
 		isEqual(other: Position): boolean;
@@ -315,7 +315,7 @@ declare module 'vscode' {
 		 * Compare this to `other`.
 		 *
 		 * @param other A position.
-		 * @return A number smaller than zero if this position is before the given position,
+		 * @returns A number smaller than zero if this position is before the given position,
 		 * a number greater than zero if this position is after the given position, or zero when
 		 * this and the given position are equal.
 		 */
@@ -326,7 +326,7 @@ declare module 'vscode' {
 		 *
 		 * @param lineDelta Delta value for the line value, default is `0`.
 		 * @param characterDelta Delta value for the character value, default is `0`.
-		 * @return A position which line and character is the sum of the current line and
+		 * @returns A position which line and character is the sum of the current line and
 		 * character and the corresponding deltas.
 		 */
 		translate(lineDelta?: number, characterDelta?: number): Position;
@@ -335,17 +335,26 @@ declare module 'vscode' {
 		 * Derived a new position relative to this position.
 		 *
 		 * @param change An object that describes a delta to this position.
-		 * @return A position that reflects the given delta. Will return `this` position if the change
+		 * @returns A position that reflects the given delta. Will return `this` position if the change
 		 * is not changing anything.
 		 */
-		translate(change: { lineDelta?: number; characterDelta?: number }): Position;
+		translate(change: {
+			/**
+			 * Delta value for the line value, default is `0`.
+			 */
+			lineDelta?: number;
+			/**
+			 * Delta value for the character value, default is `0`.
+			 */
+			characterDelta?: number;
+		}): Position;
 
 		/**
 		 * Create a new position derived from this position.
 		 *
 		 * @param line Value that should be used as line value, default is the {@link Position.line existing value}
 		 * @param character Value that should be used as character value, default is the {@link Position.character existing value}
-		 * @return A position where line and character are replaced by the given values.
+		 * @returns A position where line and character are replaced by the given values.
 		 */
 		with(line?: number, character?: number): Position;
 
@@ -353,10 +362,19 @@ declare module 'vscode' {
 		 * Derived a new position from this position.
 		 *
 		 * @param change An object that describes a change to this position.
-		 * @return A position that reflects the given change. Will return `this` position if the change
+		 * @returns A position that reflects the given change. Will return `this` position if the change
 		 * is not changing anything.
 		 */
-		with(change: { line?: number; character?: number }): Position;
+		with(change: {
+			/**
+			 * New line value, defaults the line value of `this`.
+			 */
+			line?: number;
+			/**
+			 * New character value, defaults the character value of `this`.
+			 */
+			character?: number;
+		}): Position;
 	}
 
 	/**
@@ -413,7 +431,7 @@ declare module 'vscode' {
 		 * Check if a position or a range is contained in this range.
 		 *
 		 * @param positionOrRange A position or a range.
-		 * @return `true` if the position or range is inside or equal
+		 * @returns `true` if the position or range is inside or equal
 		 * to this range.
 		 */
 		contains(positionOrRange: Position | Range): boolean;
@@ -422,7 +440,7 @@ declare module 'vscode' {
 		 * Check if `other` equals this range.
 		 *
 		 * @param other A range.
-		 * @return `true` when start and end are {@link Position.isEqual equal} to
+		 * @returns `true` when start and end are {@link Position.isEqual equal} to
 		 * start and end of this range.
 		 */
 		isEqual(other: Range): boolean;
@@ -432,7 +450,7 @@ declare module 'vscode' {
 		 * if the ranges have no overlap.
 		 *
 		 * @param range A range.
-		 * @return A range of the greater start and smaller end positions. Will
+		 * @returns A range of the greater start and smaller end positions. Will
 		 * return undefined when there is no overlap.
 		 */
 		intersection(range: Range): Range | undefined;
@@ -441,7 +459,7 @@ declare module 'vscode' {
 		 * Compute the union of `other` with this range.
 		 *
 		 * @param other A range.
-		 * @return A range of smaller start position and the greater end position.
+		 * @returns A range of smaller start position and the greater end position.
 		 */
 		union(other: Range): Range;
 
@@ -450,7 +468,7 @@ declare module 'vscode' {
 		 *
 		 * @param start A position that should be used as start. The default value is the {@link Range.start current start}.
 		 * @param end A position that should be used as end. The default value is the {@link Range.end current end}.
-		 * @return A range derived from this range with the given start and end position.
+		 * @returns A range derived from this range with the given start and end position.
 		 * If start and end are not different `this` range will be returned.
 		 */
 		with(start?: Position, end?: Position): Range;
@@ -459,10 +477,19 @@ declare module 'vscode' {
 		 * Derived a new range from this range.
 		 *
 		 * @param change An object that describes a change to this range.
-		 * @return A range that reflects the given change. Will return `this` range if the change
+		 * @returns A range that reflects the given change. Will return `this` range if the change
 		 * is not changing anything.
 		 */
-		with(change: { start?: Position; end?: Position }): Range;
+		with(change: {
+			/**
+			 * New start position, defaults to {@link Range.start current start}
+			 */
+			start?: Position;
+			/**
+			 * New end position, defaults to {@link Range.end current end}
+			 */
+			end?: Position;
+		}): Range;
 	}
 
 	/**
@@ -718,9 +745,21 @@ declare module 'vscode' {
 	 * The overview ruler supports three lanes.
 	 */
 	export enum OverviewRulerLane {
+		/**
+		 * The left lane of the overview ruler.
+		 */
 		Left = 1,
+		/**
+		 * The center lane of the overview ruler.
+		 */
 		Center = 2,
+		/**
+		 * The right lane of the overview ruler.
+		 */
 		Right = 4,
+		/**
+		 * All lanes of the overview ruler.
+		 */
 		Full = 7
 	}
 
@@ -1020,6 +1059,10 @@ declare module 'vscode' {
 		after?: ThemableDecorationAttachmentRenderOptions;
 	}
 
+	/**
+	 * Represents theme specific rendeirng styles for {@link ThemableDecorationRenderOptions.before before} and
+	 * {@link ThemableDecorationRenderOptions.after after} the content of text decorations.
+	 */
 	export interface ThemableDecorationAttachmentRenderOptions {
 		/**
 		 * Defines a text content that is shown in the attachment. Either an icon or a text can be shown, but not both.
@@ -1126,6 +1169,9 @@ declare module 'vscode' {
 		renderOptions?: DecorationInstanceRenderOptions;
 	}
 
+	/**
+	 * Represents themable render options for decoration instances.
+	 */
 	export interface ThemableDecorationInstanceRenderOptions {
 		/**
 		 * Defines the rendering options of the attachment that is inserted before the decorated text.
@@ -1138,6 +1184,9 @@ declare module 'vscode' {
 		after?: ThemableDecorationAttachmentRenderOptions;
 	}
 
+	/**
+	 * Represents render options for decoration instances. See {@link DecorationOptions.renderOptions}.
+	 */
 	export interface DecorationInstanceRenderOptions extends ThemableDecorationInstanceRenderOptions {
 		/**
 		 * Overwrite options for light themes.
@@ -1197,9 +1246,18 @@ declare module 'vscode' {
 		 *
 		 * @param callback A function which can create edits using an {@link TextEditorEdit edit-builder}.
 		 * @param options The undo/redo behavior around this edit. By default, undo stops will be created before and after this edit.
-		 * @return A promise that resolves with a value indicating if the edits could be applied.
+		 * @returns A promise that resolves with a value indicating if the edits could be applied.
 		 */
-		edit(callback: (editBuilder: TextEditorEdit) => void, options?: { readonly undoStopBefore: boolean; readonly undoStopAfter: boolean }): Thenable<boolean>;
+		edit(callback: (editBuilder: TextEditorEdit) => void, options?: {
+			/**
+			 * Add undo stop before making the edits.
+			 */
+			readonly undoStopBefore: boolean;
+			/**
+			 * Add undo stop after making the edits.
+			 */
+			readonly undoStopAfter: boolean;
+		}): Thenable<boolean>;
 
 		/**
 		 * Insert a {@link SnippetString snippet} and put the editor into snippet mode. "Snippet mode"
@@ -1209,10 +1267,19 @@ declare module 'vscode' {
 		 * @param snippet The snippet to insert in this edit.
 		 * @param location Position or range at which to insert the snippet, defaults to the current editor selection or selections.
 		 * @param options The undo/redo behavior around this edit. By default, undo stops will be created before and after this edit.
-		 * @return A promise that resolves with a value indicating if the snippet could be inserted. Note that the promise does not signal
+		 * @returns A promise that resolves with a value indicating if the snippet could be inserted. Note that the promise does not signal
 		 * that the snippet is completely filled-in or accepted.
 		 */
-		insertSnippet(snippet: SnippetString, location?: Position | Range | readonly Position[] | readonly Range[], options?: { readonly undoStopBefore: boolean; readonly undoStopAfter: boolean }): Thenable<boolean>;
+		insertSnippet(snippet: SnippetString, location?: Position | Range | readonly Position[] | readonly Range[], options?: {
+			/**
+			 * Add undo stop before making the edits.
+			 */
+			readonly undoStopBefore: boolean;
+			/**
+			 * Add undo stop after making the edits.
+			 */
+			readonly undoStopAfter: boolean;
+		}): Thenable<boolean>;
 
 		/**
 		 * Adds a set of decorations to the text editor. If a set of decorations already exists with
@@ -1325,7 +1392,7 @@ declare module 'vscode' {
 		 * @see {@link Uri.toString}
 		 * @param value The string value of an Uri.
 		 * @param strict Throw an error when `value` is empty or when no `scheme` can be parsed.
-		 * @return A new Uri instance.
+		 * @returns A new Uri instance.
 		 */
 		static parse(value: string, strict?: boolean): Uri;
 
@@ -1350,7 +1417,7 @@ declare module 'vscode' {
 		 * ```
 		 *
 		 * @param path A file system or UNC path.
-		 * @return A new Uri instance.
+		 * @returns A new Uri instance.
 		 */
 		static file(path: string): Uri;
 
@@ -1381,9 +1448,30 @@ declare module 'vscode' {
 		 *
 		 * @see {@link Uri.toString}
 		 * @param components The component parts of an Uri.
-		 * @return A new Uri instance.
+		 * @returns A new Uri instance.
 		 */
-		static from(components: { readonly scheme: string; readonly authority?: string; readonly path?: string; readonly query?: string; readonly fragment?: string }): Uri;
+		static from(components: {
+			/**
+			 * The scheme of the uri
+			 */
+			readonly scheme: string;
+			/**
+			 * The authority of the uri
+			 */
+			readonly authority?: string;
+			/**
+			 * The path of the uri
+			 */
+			readonly path?: string;
+			/**
+			 * The query string of the uri
+			 */
+			readonly query?: string;
+			/**
+			 * The fragment identifier of the uri
+			 */
+			readonly fragment?: string;
+		}): Uri;
 
 		/**
 		 * Use the `file` and `parse` factory functions to create new `Uri` objects.
@@ -1450,10 +1538,31 @@ declare module 'vscode' {
 		 *
 		 * @param change An object that describes a change to this Uri. To unset components use `null` or
 		 *  the empty string.
-		 * @return A new Uri that reflects the given change. Will return `this` Uri if the change
+		 * @returns A new Uri that reflects the given change. Will return `this` Uri if the change
 		 *  is not changing anything.
 		 */
-		with(change: { scheme?: string; authority?: string; path?: string; query?: string; fragment?: string }): Uri;
+		with(change: {
+			/**
+			 * The new scheme, defauls to this Uri's scheme.
+			 */
+			scheme?: string;
+			/**
+			 * The new authority, defaults to this Uri's authority.
+			 */
+			authority?: string;
+			/**
+			 * The new path, defaults to this Uri's path.
+			 */
+			path?: string;
+			/**
+			 * The new query, defaults to this Uri's query.
+			 */
+			query?: string;
+			/**
+			 * The new fragment, defaults to this Uri's fragment.
+			 */
+			fragment?: string;
+		}): Uri;
 
 		/**
 		 * Returns a string representation of this Uri. The representation and normalization
@@ -1477,7 +1586,7 @@ declare module 'vscode' {
 		/**
 		 * Returns a JSON representation of this Uri.
 		 *
-		 * @return An object.
+		 * @returns An object.
 		 */
 		toJSON(): any;
 	}
@@ -1551,10 +1660,15 @@ declare module 'vscode' {
 		 *
 		 * @param disposableLikes Objects that have at least a `dispose`-function member. Note that asynchronous
 		 * dispose-functions aren't awaited.
-		 * @return Returns a new disposable which, upon dispose, will
+		 * @returns Returns a new disposable which, upon dispose, will
 		 * dispose all provided disposables.
 		 */
-		static from(...disposableLikes: { dispose: () => any }[]): Disposable;
+		static from(...disposableLikes: {
+			/**
+			 * Function to clean up resources.
+			 */
+			dispose: () => any;
+		}[]): Disposable;
 
 		/**
 		 * Creates a new disposable that calls the provided function
@@ -1590,7 +1704,7 @@ declare module 'vscode' {
 		 * @param listener The listener function will be called when the event happens.
 		 * @param thisArgs The `this`-argument which will be used when calling the event listener.
 		 * @param disposables An array to which a {@link Disposable} will be added.
-		 * @return A disposable which unsubscribes the event listener.
+		 * @returns A disposable which unsubscribes the event listener.
 		 */
 		(listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]): Disposable;
 	}
@@ -1695,7 +1809,7 @@ declare module 'vscode' {
 		 *
 		 * @param uri An uri which scheme matches the scheme this provider was {@link workspace.registerTextDocumentContentProvider registered} for.
 		 * @param token A cancellation token.
-		 * @return A string or a thenable that resolves to such.
+		 * @returns A string or a thenable that resolves to such.
 		 */
 		provideTextDocumentContent(uri: Uri, token: CancellationToken): ProviderResult<string>;
 	}
@@ -1736,7 +1850,16 @@ declare module 'vscode' {
 		/**
 		 * The icon path or {@link ThemeIcon} for the QuickPickItem.
 		 */
-		iconPath?: Uri | { light: Uri; dark: Uri } | ThemeIcon;
+		iconPath?: Uri | {
+			/**
+			 * The icon path for the light theme.
+			 */
+			light: Uri;
+			/**
+			 * The icon path for the dark theme.
+			 */
+			dark: Uri;
+		} | ThemeIcon;
 
 		/**
 		 * A human-readable string which is rendered less prominent in the same line. Supports rendering of
@@ -1983,9 +2106,21 @@ declare module 'vscode' {
 	/**
 	 * Impacts the behavior and appearance of the validation message.
 	 */
+	/**
+	 * The severity level for input box validation.
+	 */
 	export enum InputBoxValidationSeverity {
+		/**
+		 * Informational severity level.
+		 */
 		Info = 1,
+		/**
+		 * Warning severity level.
+		 */
 		Warning = 2,
+		/**
+		 * Error severity level.
+		 */
 		Error = 3
 	}
 
@@ -2055,7 +2190,7 @@ declare module 'vscode' {
 		 * to the user.
 		 *
 		 * @param value The current value of the input box.
-		 * @return Either a human-readable string which is presented as an error message or an {@link InputBoxValidationMessage}
+		 * @returns Either a human-readable string which is presented as an error message or an {@link InputBoxValidationMessage}
 		 *  which can provide a specific message severity. Return `undefined`, `null`, or the empty string when 'value' is valid.
 		 */
 		validateInput?(value: string): string | InputBoxValidationMessage | undefined | null |
@@ -2330,6 +2465,11 @@ declare module 'vscode' {
 		 */
 		static readonly SourceFixAll: CodeActionKind;
 
+		/**
+		 * Private constructor, use statix `CodeActionKind.XYZ` to derive from an existing code action kind.
+		 *
+		 * @param value The value of the kind, such as `refactor.extract.function`.
+		 */
 		private constructor(value: string);
 
 		/**
@@ -2516,7 +2656,7 @@ declare module 'vscode' {
 		 * actions and avoid returning irrelevant code actions that the editor will discard.
 		 * @param token A cancellation token.
 		 *
-		 * @return An array of code actions, such as quick fixes or refactorings. The lack of a result can be signaled
+		 * @returns An array of code actions, such as quick fixes or refactorings. The lack of a result can be signaled
 		 * by returning `undefined`, `null`, or an empty array.
 		 *
 		 * We also support returning `Command` for legacy reasons, however all new extensions should return
@@ -2535,7 +2675,7 @@ declare module 'vscode' {
 		 *
 		 * @param codeAction A code action.
 		 * @param token A cancellation token.
-		 * @return The resolved code action or a thenable that resolves to such. It is OK to return the given
+		 * @returns The resolved code action or a thenable that resolves to such. It is OK to return the given
 		 * `item`. When no result is returned, the given `item` will be used.
 		 */
 		resolveCodeAction?(codeAction: T, token: CancellationToken): ProviderResult<T>;
@@ -2644,7 +2784,7 @@ declare module 'vscode' {
 		 *
 		 * @param document The document in which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return An array of code lenses or a thenable that resolves to such. The lack of a result can be
+		 * @returns An array of code lenses or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideCodeLenses(document: TextDocument, token: CancellationToken): ProviderResult<T[]>;
@@ -2655,7 +2795,7 @@ declare module 'vscode' {
 		 *
 		 * @param codeLens Code lens that must be resolved.
 		 * @param token A cancellation token.
-		 * @return The given, resolved code lens or thenable that resolves to such.
+		 * @returns The given, resolved code lens or thenable that resolves to such.
 		 */
 		resolveCodeLens?(codeLens: T, token: CancellationToken): ProviderResult<T>;
 	}
@@ -2688,7 +2828,7 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param position The position at which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return A definition or a thenable that resolves to such. The lack of a result can be
+		 * @returns A definition or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
@@ -2706,7 +2846,7 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param position The position at which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return A definition or a thenable that resolves to such. The lack of a result can be
+		 * @returns A definition or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideImplementation(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
@@ -2724,7 +2864,7 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param position The position at which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return A definition or a thenable that resolves to such. The lack of a result can be
+		 * @returns A definition or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideTypeDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
@@ -2748,7 +2888,7 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param position The position at which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return A declaration or a thenable that resolves to such. The lack of a result can be
+		 * @returns A declaration or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideDeclaration(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Declaration>;
@@ -2774,10 +2914,13 @@ declare module 'vscode' {
 		 * markdown supports links that execute commands, e.g. `[Run it](command:myCommandId)`.
 		 *
 		 * Defaults to `false` (commands are disabled).
-		 *
-		 * If this is an object, only the set of commands listed in `enabledCommands` are allowed.
 		 */
-		isTrusted?: boolean | { readonly enabledCommands: readonly string[] };
+		isTrusted?: boolean | {
+			/**
+			 * A set of commend ids that are allowed to be executed by this markdown string.
+			 */
+			readonly enabledCommands: readonly string[];
+		};
 
 		/**
 		 * Indicates that this markdown string can contain {@link ThemeIcon ThemeIcons}, e.g. `$(zap)`.
@@ -2852,7 +2995,18 @@ declare module 'vscode' {
 	 *
 	 * @deprecated This type is deprecated, please use {@linkcode MarkdownString} instead.
 	 */
-	export type MarkedString = string | { language: string; value: string };
+	export type MarkedString = string | {
+		/**
+		 * The language of a markdown code block
+		 * @deprecated, please use {@linkcode MarkdownString} instead
+		 */
+		language: string;
+		/**
+		 * The code snippet of a markdown code block.
+		 * @deprecated, please use {@linkcode MarkdownString} instead
+		 */
+		value: string;
+	};
 
 	/**
 	 * A hover represents additional information for a symbol or word. Hovers are
@@ -2895,7 +3049,7 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param position The position at which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return A hover or a thenable that resolves to such. The lack of a result can be
+		 * @returns A hover or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideHover(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Hover>;
@@ -2944,7 +3098,7 @@ declare module 'vscode' {
 		 * @param document The document for which the debug hover is about to appear.
 		 * @param position The line and character position in the document where the debug hover is about to appear.
 		 * @param token A cancellation token.
-		 * @return An EvaluatableExpression or a thenable that resolves to such. The lack of a result can be
+		 * @returns An EvaluatableExpression or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideEvaluatableExpression(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<EvaluatableExpression>;
@@ -3072,7 +3226,7 @@ declare module 'vscode' {
 		 * @param viewPort The visible document range for which inline values should be computed.
 		 * @param context A bag containing contextual information like the current location.
 		 * @param token A cancellation token.
-		 * @return An array of InlineValueDescriptors or a thenable that resolves to such. The lack of a result can be
+		 * @returns An array of InlineValueDescriptors or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideInlineValues(document: TextDocument, viewPort: Range, context: InlineValueContext, token: CancellationToken): ProviderResult<InlineValue[]>;
@@ -3138,7 +3292,7 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param position The position at which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
+		 * @returns An array of document highlights or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideDocumentHighlights(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<DocumentHighlight[]>;
@@ -3148,31 +3302,109 @@ declare module 'vscode' {
 	 * A symbol kind.
 	 */
 	export enum SymbolKind {
+		/**
+		 * The `File` symbol kind.
+		 */
 		File = 0,
+		/**
+		 * The `Module` symbol kind.
+		 */
 		Module = 1,
+		/**
+		 * The `Namespace` symbol kind.
+		 */
 		Namespace = 2,
+		/**
+		 * The `Package` symbol kind.
+		 */
 		Package = 3,
+		/**
+		 * The `Class` symbol kind.
+		 */
 		Class = 4,
+		/**
+		 * The `Method` symbol kind.
+		 */
 		Method = 5,
+		/**
+		 * The `Property` symbol kind.
+		 */
 		Property = 6,
+		/**
+		 * The `Field` symbol kind.
+		 */
 		Field = 7,
+		/**
+		 * The `Constructor` symbol kind.
+		 */
 		Constructor = 8,
+		/**
+		 * The `Enum` symbol kind.
+		 */
 		Enum = 9,
+		/**
+		 * The `Interface` symbol kind.
+		 */
 		Interface = 10,
+		/**
+		 * The `Function` symbol kind.
+		 */
 		Function = 11,
+		/**
+		 * The `Variable` symbol kind.
+		 */
 		Variable = 12,
+		/**
+		 * The `Constant` symbol kind.
+		 */
 		Constant = 13,
+		/**
+		 * The `String` symbol kind.
+		 */
 		String = 14,
+		/**
+		 * The `Number` symbol kind.
+		 */
 		Number = 15,
+		/**
+		 * The `Boolean` symbol kind.
+		 */
 		Boolean = 16,
+		/**
+		 * The `Array` symbol kind.
+		 */
 		Array = 17,
+		/**
+		 * The `Object` symbol kind.
+		 */
 		Object = 18,
+		/**
+		 * The `Key` symbol kind.
+		 */
 		Key = 19,
+		/**
+		 * The `Null` symbol kind.
+		 */
 		Null = 20,
+		/**
+		 * The `EnumMember` symbol kind.
+		 */
 		EnumMember = 21,
+		/**
+		 * The `Struct` symbol kind.
+		 */
 		Struct = 22,
+		/**
+		 * The `Event` symbol kind.
+		 */
 		Event = 23,
+		/**
+		 * The `Operator` symbol kind.
+		 */
 		Operator = 24,
+		/**
+		 * The `TypeParameter` symbol kind.
+		 */
 		TypeParameter = 25
 	}
 
@@ -3308,7 +3540,7 @@ declare module 'vscode' {
 		 *
 		 * @param document The document in which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
+		 * @returns An array of document highlights or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<SymbolInformation[] | DocumentSymbol[]>;
@@ -3344,7 +3576,7 @@ declare module 'vscode' {
 		 *
 		 * @param query A query string, can be the empty string in which case all symbols should be returned.
 		 * @param token A cancellation token.
-		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
+		 * @returns An array of document highlights or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideWorkspaceSymbols(query: string, token: CancellationToken): ProviderResult<T[]>;
@@ -3358,7 +3590,7 @@ declare module 'vscode' {
 		 * @param symbol The symbol that is to be resolved. Guaranteed to be an instance of an object returned from an
 		 * earlier call to `provideWorkspaceSymbols`.
 		 * @param token A cancellation token.
-		 * @return The resolved symbol or a thenable that resolves to that. When no result is returned,
+		 * @returns The resolved symbol or a thenable that resolves to that. When no result is returned,
 		 * the given `symbol` is used.
 		 */
 		resolveWorkspaceSymbol?(symbol: T, token: CancellationToken): ProviderResult<T>;
@@ -3389,7 +3621,7 @@ declare module 'vscode' {
 		 * @param position The position at which the command was invoked.
 		 * @param token A cancellation token.
 		 *
-		 * @return An array of locations or a thenable that resolves to such. The lack of a result can be
+		 * @returns An array of locations or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideReferences(document: TextDocument, position: Position, context: ReferenceContext, token: CancellationToken): ProviderResult<Location[]>;
@@ -3406,7 +3638,7 @@ declare module 'vscode' {
 		 *
 		 * @param range A range.
 		 * @param newText A string.
-		 * @return A new text edit object.
+		 * @returns A new text edit object.
 		 */
 		static replace(range: Range, newText: string): TextEdit;
 
@@ -3415,7 +3647,7 @@ declare module 'vscode' {
 		 *
 		 * @param position A position, will become an empty range.
 		 * @param newText A string.
-		 * @return A new text edit object.
+		 * @returns A new text edit object.
 		 */
 		static insert(position: Position, newText: string): TextEdit;
 
@@ -3423,7 +3655,7 @@ declare module 'vscode' {
 		 * Utility to create a delete edit.
 		 *
 		 * @param range A range.
-		 * @return A new text edit object.
+		 * @returns A new text edit object.
 		 */
 		static delete(range: Range): TextEdit;
 
@@ -3431,7 +3663,7 @@ declare module 'vscode' {
 		 * Utility to create an eol-edit.
 		 *
 		 * @param eol An eol-sequence
-		 * @return A new text edit object.
+		 * @returns A new text edit object.
 		 */
 		static setEndOfLine(eol: EndOfLine): TextEdit;
 
@@ -3478,7 +3710,7 @@ declare module 'vscode' {
 		 *
 		 * @param range A range.
 		 * @param snippet A snippet string.
-		 * @return A new snippet edit object.
+		 * @returns A new snippet edit object.
 		 */
 		static replace(range: Range, snippet: SnippetString): SnippetTextEdit;
 
@@ -3487,7 +3719,7 @@ declare module 'vscode' {
 		 *
 		 * @param position A position, will become an empty range.
 		 * @param snippet A snippet string.
-		 * @return A new snippet edit object.
+		 * @returns A new snippet edit object.
 		 */
 		static insert(position: Position, snippet: SnippetString): SnippetTextEdit;
 
@@ -3573,6 +3805,12 @@ declare module 'vscode' {
 		 */
 		newNotebookMetadata?: { [key: string]: any };
 
+		/**
+		 * Create a new notebook edit.
+		 *
+		 * @param range A notebook range.
+		 * @param newCells An array of new cell data.
+		 */
 		constructor(range: NotebookRange, newCells: NotebookCellData[]);
 	}
 
@@ -3601,7 +3839,16 @@ declare module 'vscode' {
 		/**
 		 * The icon path or {@link ThemeIcon} for the edit.
 		 */
-		iconPath?: Uri | { light: Uri; dark: Uri } | ThemeIcon;
+		iconPath?: Uri | {
+			/**
+			 * The icon path for the light theme.
+			 */
+			light: Uri;
+			/**
+			 * The icon path for the dark theme.
+			 */
+			dark: Uri;
+		} | ThemeIcon;
 	}
 
 	/**
@@ -3660,7 +3907,7 @@ declare module 'vscode' {
 		 * Check if a text edit for a resource exists.
 		 *
 		 * @param uri A resource identifier.
-		 * @return `true` if the given resource will be touched by this edit.
+		 * @returns `true` if the given resource will be touched by this edit.
 		 */
 		has(uri: Uri): boolean;
 
@@ -3700,7 +3947,7 @@ declare module 'vscode' {
 		 * Get the text edits for a resource.
 		 *
 		 * @param uri A resource identifier.
-		 * @return An array of text edits.
+		 * @returns An array of text edits.
 		 */
 		get(uri: Uri): TextEdit[];
 
@@ -3716,9 +3963,14 @@ declare module 'vscode' {
 		 * @param metadata Optional metadata for the entry.
 		 */
 		createFile(uri: Uri, options?: {
+			/**
+			 * Overwrite existing file. Overwrite wins over `ignoreIfExists`
+			 */
 			readonly overwrite?: boolean;
+			/**
+			 * Do nothing if a file with `uri` exists already.
+			 */
 			readonly ignoreIfExists?: boolean;
-
 			/**
 			 * The initial contents of the new file.
 			 *
@@ -3734,7 +3986,16 @@ declare module 'vscode' {
 		 * @param uri The uri of the file that is to be deleted.
 		 * @param metadata Optional metadata for the entry.
 		 */
-		deleteFile(uri: Uri, options?: { readonly recursive?: boolean; readonly ignoreIfNotExists?: boolean }, metadata?: WorkspaceEditEntryMetadata): void;
+		deleteFile(uri: Uri, options?: {
+			/**
+			 * Delete the content recursively if a folder is denoted.
+			 */
+			readonly recursive?: boolean;
+			/**
+			 * Do nothing if a file with `uri` exists already.
+			 */
+			readonly ignoreIfNotExists?: boolean;
+		}, metadata?: WorkspaceEditEntryMetadata): void;
 
 		/**
 		 * Rename a file or folder.
@@ -3745,12 +4006,21 @@ declare module 'vscode' {
 		 * ignored. When overwrite and ignoreIfExists are both set overwrite wins.
 		 * @param metadata Optional metadata for the entry.
 		 */
-		renameFile(oldUri: Uri, newUri: Uri, options?: { readonly overwrite?: boolean; readonly ignoreIfExists?: boolean }, metadata?: WorkspaceEditEntryMetadata): void;
+		renameFile(oldUri: Uri, newUri: Uri, options?: {
+			/**
+			 * Overwrite existing file. Overwrite wins over `ignoreIfExists`
+			 */
+			readonly overwrite?: boolean;
+			/**
+			 * Do nothing if a file with `uri` exists already.
+			 */
+			readonly ignoreIfExists?: boolean;
+		}, metadata?: WorkspaceEditEntryMetadata): void;
 
 		/**
 		 * Get all text edits grouped by resource.
 		 *
-		 * @return A shallow copy of `[Uri, TextEdit[]]`-tuples.
+		 * @returns A shallow copy of `[Uri, TextEdit[]]`-tuples.
 		 */
 		entries(): [Uri, TextEdit[]][];
 	}
@@ -3772,6 +4042,11 @@ declare module 'vscode' {
 		 */
 		value: string;
 
+		/**
+		 * Create a new snippet string.
+		 *
+		 * @param value A snippet string.
+		 */
 		constructor(value?: string);
 
 		/**
@@ -3779,7 +4054,7 @@ declare module 'vscode' {
 		 * the {@linkcode SnippetString.value value} of this snippet string.
 		 *
 		 * @param string A value to append 'as given'. The string will be escaped.
-		 * @return This snippet string.
+		 * @returns This snippet string.
 		 */
 		appendText(string: string): SnippetString;
 
@@ -3789,7 +4064,7 @@ declare module 'vscode' {
 		 *
 		 * @param number The number of this tabstop, defaults to an auto-increment
 		 * value starting at 1.
-		 * @return This snippet string.
+		 * @returns This snippet string.
 		 */
 		appendTabstop(number?: number): SnippetString;
 
@@ -3801,7 +4076,7 @@ declare module 'vscode' {
 		 * with which a nested snippet can be created.
 		 * @param number The number of this tabstop, defaults to an auto-increment
 		 * value starting at 1.
-		 * @return This snippet string.
+		 * @returns This snippet string.
 		 */
 		appendPlaceholder(value: string | ((snippet: SnippetString) => any), number?: number): SnippetString;
 
@@ -3812,7 +4087,7 @@ declare module 'vscode' {
 		 * @param values The values for choices - the array of strings
 		 * @param number The number of this tabstop, defaults to an auto-increment
 		 * value starting at 1.
-		 * @return This snippet string.
+		 * @returns This snippet string.
 		 */
 		appendChoice(values: readonly string[], number?: number): SnippetString;
 
@@ -3823,7 +4098,7 @@ declare module 'vscode' {
 		 * @param name The name of the variable - excluding the `$`.
 		 * @param defaultValue The default value which is used when the variable name cannot
 		 * be resolved - either a string or a function with which a nested snippet can be created.
-		 * @return This snippet string.
+		 * @returns This snippet string.
 		 */
 		appendVariable(name: string, defaultValue: string | ((snippet: SnippetString) => any)): SnippetString;
 	}
@@ -3842,7 +4117,7 @@ declare module 'vscode' {
 		 * @param position The position at which the command was invoked.
 		 * @param newName The new name of the symbol. If the given name is not valid, the provider must return a rejected promise.
 		 * @param token A cancellation token.
-		 * @return A workspace edit or a thenable that resolves to such. The lack of a result can be
+		 * @returns A workspace edit or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideRenameEdits(document: TextDocument, position: Position, newName: string, token: CancellationToken): ProviderResult<WorkspaceEdit>;
@@ -3858,9 +4133,18 @@ declare module 'vscode' {
 		 * @param document The document in which rename will be invoked.
 		 * @param position The position at which rename will be invoked.
 		 * @param token A cancellation token.
-		 * @return The range or range and placeholder text of the identifier that is to be renamed. The lack of a result can signaled by returning `undefined` or `null`.
+		 * @returns The range or range and placeholder text of the identifier that is to be renamed. The lack of a result can signaled by returning `undefined` or `null`.
 		 */
-		prepareRename?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range | { range: Range; placeholder: string }>;
+		prepareRename?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range | {
+			/**
+			 * The range of the identifier that can be renamed.
+			 */
+			range: Range;
+			/**
+			 * The placeholder of the editors rename input box.
+			 */
+			placeholder: string;
+		}>;
 	}
 
 	/**
@@ -3877,6 +4161,12 @@ declare module 'vscode' {
 		 */
 		readonly tokenModifiers: string[];
 
+		/**
+		 * Creates a semantic tokens legend.
+		 *
+		 * @param tokenTypes An array of token types.
+		 * @param tokenModifiers An array of token modifiers.
+		 */
 		constructor(tokenTypes: string[], tokenModifiers?: string[]);
 	}
 
@@ -3886,6 +4176,11 @@ declare module 'vscode' {
 	 */
 	export class SemanticTokensBuilder {
 
+		/**
+		 * Creates a semantic tokens builder.
+		 *
+		 * @param legend A semantic tokens legent.
+		 */
 		constructor(legend?: SemanticTokensLegend);
 
 		/**
@@ -3932,6 +4227,12 @@ declare module 'vscode' {
 		 */
 		readonly data: Uint32Array;
 
+		/**
+		 * Create new semantic tokens.
+		 *
+		 * @param data Token data.
+		 * @param resultId Result identifier.
+		 */
 		constructor(data: Uint32Array, resultId?: string);
 	}
 
@@ -3952,6 +4253,12 @@ declare module 'vscode' {
 		 */
 		readonly edits: SemanticTokensEdit[];
 
+		/**
+		 * Create new semantic tokens edits.
+		 *
+		 * @param edits An array of semantic token edits
+		 * @param resultId Result identifier.
+		 */
 		constructor(edits: SemanticTokensEdit[], resultId?: string);
 	}
 
@@ -3973,6 +4280,13 @@ declare module 'vscode' {
 		 */
 		readonly data: Uint32Array | undefined;
 
+		/**
+		 * Create a semantic token edit.
+		 *
+		 * @param start Start offset
+		 * @param deleteCount Number of elements to remove.
+		 * @param data Elements to insert
+		 */
 		constructor(start: number, deleteCount: number, data?: Uint32Array);
 	}
 
@@ -4123,7 +4437,7 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param options Options controlling formatting.
 		 * @param token A cancellation token.
-		 * @return A set of text edits or a thenable that resolves to such. The lack of a result can be
+		 * @returns A set of text edits or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideDocumentFormattingEdits(document: TextDocument, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
@@ -4146,7 +4460,7 @@ declare module 'vscode' {
 		 * @param range The range which should be formatted.
 		 * @param options Options controlling formatting.
 		 * @param token A cancellation token.
-		 * @return A set of text edits or a thenable that resolves to such. The lack of a result can be
+		 * @returns A set of text edits or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
@@ -4166,7 +4480,7 @@ declare module 'vscode' {
 		 * @param ranges The ranges which should be formatted.
 		 * @param options Options controlling formatting.
 		 * @param token A cancellation token.
-		 * @return A set of text edits or a thenable that resolves to such. The lack of a result can be
+		 * @returns A set of text edits or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideDocumentRangesFormattingEdits?(document: TextDocument, ranges: Range[], options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
@@ -4190,7 +4504,7 @@ declare module 'vscode' {
 		 * @param ch The character that has been typed.
 		 * @param options Options controlling formatting.
 		 * @param token A cancellation token.
-		 * @return A set of text edits or a thenable that resolves to such. The lack of a result can be
+		 * @returns A set of text edits or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideOnTypeFormattingEdits(document: TextDocument, position: Position, ch: string, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
@@ -4358,7 +4672,7 @@ declare module 'vscode' {
 		 * @param token A cancellation token.
 		 * @param context Information about how signature help was triggered.
 		 *
-		 * @return Signature help or a thenable that resolves to such. The lack of a result can be
+		 * @returns Signature help or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideSignatureHelp(document: TextDocument, position: Position, token: CancellationToken, context: SignatureHelpContext): ProviderResult<SignatureHelp>;
@@ -4411,32 +4725,113 @@ declare module 'vscode' {
 	 * Completion item kinds.
 	 */
 	export enum CompletionItemKind {
+		/**
+		 * The `Text` completion item kind.
+		 */
 		Text = 0,
+		/**
+		 * The `Method` completion item kind.
+		 */
 		Method = 1,
+		/**
+		 * The `Function` completion item kind.
+		 */
 		Function = 2,
+		/**
+		 * The `Constructor` completion item kind.
+		 */
 		Constructor = 3,
+		/**
+		 * The `Field` completion item kind.
+		 */
 		Field = 4,
+		/**
+		 * The `Variable` completion item kind.
+		 */
 		Variable = 5,
+		/**
+		 * The `Class` completion item kind.
+		 */
 		Class = 6,
+		/**
+		 * The `Interface` completion item kind.
+		 */
 		Interface = 7,
+		/**
+		 * The `Module` completion item kind.
+		 */
 		Module = 8,
+		/**
+		 * The `Property` completion item kind.
+		 */
 		Property = 9,
+		/**
+		 * The `Unit` completion item kind.
+		 */
 		Unit = 10,
+		/**
+		 * The `Value` completion item kind.
+		 */
 		Value = 11,
+		/**
+		 * The `Enum` completion item kind.
+		 */
 		Enum = 12,
+		/**
+		 * The `Keyword` completion item kind.
+		 */
 		Keyword = 13,
+		/**
+		 * The `Snippet` completion item kind.
+		 */
 		Snippet = 14,
+		/**
+		 * The `Color` completion item kind.
+		 */
 		Color = 15,
+		/**
+		 * The `Reference` completion item kind.
+		 */
 		Reference = 17,
+		/**
+		 * The `File` completion item kind.
+		 */
 		File = 16,
+		/**
+		 * The `Folder` completion item kind.
+		 */
 		Folder = 18,
+		/**
+		 * The `EnumMember` completion item kind.
+		 */
 		EnumMember = 19,
+		/**
+		 * The `Constant` completion item kind.
+		 */
 		Constant = 20,
+		/**
+		 * The `Struct` completion item kind.
+		 */
 		Struct = 21,
+		/**
+		 * The `Event` completion item kind.
+		 */
 		Event = 22,
+		/**
+		 * The `Operator` completion item kind.
+		 */
 		Operator = 23,
+		/**
+		 * The `TypeParameter` completion item kind.
+		 */
 		TypeParameter = 24,
+		/**
+		 * The `User` completion item kind.
+		 */
 		User = 25,
+		/**
+		 * The `Issue` completion item kind.
+		 */
 		Issue = 26,
 	}
 
@@ -4546,7 +4941,16 @@ declare module 'vscode' {
 		 * {@link Range.contains contain} the position at which completion has been {@link CompletionItemProvider.provideCompletionItems requested}.
 		 * *Note 2:* A insert range must be a prefix of a replace range, that means it must be contained and starting at the same position.
 		 */
-		range?: Range | { inserting: Range; replacing: Range };
+		range?: Range | {
+			/**
+			 * The range that should be used when insert-accepting a completion. Must be a prefix of `replaceRange`.
+			 */
+			inserting: Range;
+			/**
+			 * The range that should be used when replace-accepting a completion.
+			 */
+			replacing: Range;
+		};
 
 		/**
 		 * An optional set of characters that when pressed while this completion is active will accept it first and
@@ -4687,7 +5091,7 @@ declare module 'vscode' {
 		 * @param token A cancellation token.
 		 * @param context How the completion was triggered.
 		 *
-		 * @return An array of completions, a {@link CompletionList completion list}, or a thenable that resolves to either.
+		 * @returns An array of completions, a {@link CompletionList completion list}, or a thenable that resolves to either.
 		 * The lack of a result can be signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken, context: CompletionContext): ProviderResult<T[] | CompletionList<T>>;
@@ -4708,7 +5112,7 @@ declare module 'vscode' {
 		 *
 		 * @param item A completion item currently active in the UI.
 		 * @param token A cancellation token.
-		 * @return The resolved completion item or a thenable that resolves to of such. It is OK to return the given
+		 * @returns The resolved completion item or a thenable that resolves to of such. It is OK to return the given
 		 * `item`. When no result is returned, the given `item` will be used.
 		 */
 		resolveCompletionItem?(item: T, token: CancellationToken): ProviderResult<T>;
@@ -4734,7 +5138,7 @@ declare module 'vscode' {
 		 * @param position The position inline completions are requested for.
 		 * @param context A context object with additional information.
 		 * @param token A cancellation token.
-		 * @return An array of completion items or a thenable that resolves to an array of completion items.
+		 * @returns An array of completion items or a thenable that resolves to an array of completion items.
 		 */
 		provideInlineCompletionItems(document: TextDocument, position: Position, context: InlineCompletionContext, token: CancellationToken): ProviderResult<InlineCompletionItem[] | InlineCompletionList>;
 	}
@@ -4898,7 +5302,7 @@ declare module 'vscode' {
 		 *
 		 * @param document The document in which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return An array of {@link DocumentLink document links} or a thenable that resolves to such. The lack of a result
+		 * @returns An array of {@link DocumentLink document links} or a thenable that resolves to such. The lack of a result
 		 * can be signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideDocumentLinks(document: TextDocument, token: CancellationToken): ProviderResult<T[]>;
@@ -5024,7 +5428,7 @@ declare module 'vscode' {
 		 *
 		 * @param document The document in which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return An array of {@link ColorInformation color information} or a thenable that resolves to such. The lack of a result
+		 * @returns An array of {@link ColorInformation color information} or a thenable that resolves to such. The lack of a result
 		 * can be signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideDocumentColors(document: TextDocument, token: CancellationToken): ProviderResult<ColorInformation[]>;
@@ -5035,10 +5439,19 @@ declare module 'vscode' {
 		 * @param color The color to show and insert.
 		 * @param context A context object with additional information
 		 * @param token A cancellation token.
-		 * @return An array of color presentations or a thenable that resolves to such. The lack of a result
+		 * @returns An array of color presentations or a thenable that resolves to such. The lack of a result
 		 * can be signaled by returning `undefined`, `null`, or an empty array.
 		 */
-		provideColorPresentations(color: Color, context: { readonly document: TextDocument; readonly range: Range }, token: CancellationToken): ProviderResult<ColorPresentation[]>;
+		provideColorPresentations(color: Color, context: {
+			/**
+			 * The text document that contains the color
+			 */
+			readonly document: TextDocument;
+			/**
+			 * The range in the document where the color is located.
+			 */
+			readonly range: Range;
+		}, token: CancellationToken): ProviderResult<ColorPresentation[]>;
 	}
 
 	/**
@@ -5194,7 +5607,7 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param range The range for which inlay hints should be computed.
 		 * @param token A cancellation token.
-		 * @return An array of inlay hints or a thenable that resolves to such.
+		 * @returns An array of inlay hints or a thenable that resolves to such.
 		 */
 		provideInlayHints(document: TextDocument, range: Range, token: CancellationToken): ProviderResult<T[]>;
 
@@ -5206,7 +5619,7 @@ declare module 'vscode' {
 		 *
 		 * @param hint An inlay hint.
 		 * @param token A cancellation token.
-		 * @return The resolved inlay hint or a thenable that resolves to such. It is OK to return the given `item`. When no result is returned, the given `item` will be used.
+		 * @returns The resolved inlay hint or a thenable that resolves to such. It is OK to return the given `item`. When no result is returned, the given `item` will be used.
 		 */
 		resolveInlayHint?(hint: T, token: CancellationToken): ProviderResult<T>;
 	}
@@ -5321,6 +5734,9 @@ declare module 'vscode' {
 		constructor(range: Range, parent?: SelectionRange);
 	}
 
+	/**
+	 * The selection range provider interface defines the contract between extensions and the "Expand and Shrink Selection" feature.
+	 */
 	export interface SelectionRangeProvider {
 		/**
 		 * Provide selection ranges for the given positions.
@@ -5332,7 +5748,7 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param positions The positions at which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return Selection ranges or a thenable that resolves to such. The lack of a result can be
+		 * @returns Selection ranges or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideSelectionRanges(document: TextDocument, positions: readonly Position[], token: CancellationToken): ProviderResult<SelectionRange[]>;
@@ -5618,7 +6034,7 @@ declare module 'vscode' {
 		 * @param document The document in which the provider was invoked.
 		 * @param position The position at which the provider was invoked.
 		 * @param token A cancellation token.
-		 * @return A list of ranges that can be edited together
+		 * @returns A list of ranges that can be edited together
 		 */
 		provideLinkedEditingRanges(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<LinkedEditingRanges>;
 	}
@@ -5659,7 +6075,7 @@ declare module 'vscode' {
 		 * @param dataTransfer A {@link DataTransfer} object that holds data about what is being dragged and dropped.
 		 * @param token A cancellation token.
 		 *
-		 * @return A {@link DocumentDropEdit} or a thenable that resolves to such. The lack of a result can be
+		 * @returns A {@link DocumentDropEdit} or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideDocumentDropEdits(document: TextDocument, position: Position, dataTransfer: DataTransfer, token: CancellationToken): ProviderResult<DocumentDropEdit>;
@@ -5823,9 +6239,21 @@ declare module 'vscode' {
 			 * @deprecated
 			 */
 			docComment?: {
+				/**
+				 * @deprecated
+				 */
 				scope: string;
+				/**
+				 * @deprecated
+				 */
 				open: string;
+				/**
+				 * @deprecated
+				 */
 				lineStart: string;
+				/**
+				 * @deprecated
+				 */
 				close?: string;
 			};
 		};
@@ -5836,9 +6264,21 @@ declare module 'vscode' {
 		 * @deprecated * Use the autoClosingPairs property in the language configuration file instead.
 		 */
 		__characterPairSupport?: {
+			/**
+			 * @deprecated
+			 */
 			autoClosingPairs: {
+				/**
+				 * @deprecated
+				 */
 				open: string;
+				/**
+				 * @deprecated
+				 */
 				close: string;
+				/**
+				 * @deprecated
+				 */
 				notIn?: string[];
 			}[];
 		};
@@ -5933,7 +6373,7 @@ declare module 'vscode' {
 		 * Return a value from this configuration.
 		 *
 		 * @param section Configuration name, supports _dotted_ names.
-		 * @return The value `section` denotes or `undefined`.
+		 * @returns The value `section` denotes or `undefined`.
 		 */
 		get<T>(section: string): T | undefined;
 
@@ -5942,7 +6382,7 @@ declare module 'vscode' {
 		 *
 		 * @param section Configuration name, supports _dotted_ names.
 		 * @param defaultValue A value should be returned when no value could be found, is `undefined`.
-		 * @return The value `section` denotes or the default.
+		 * @returns The value `section` denotes or the default.
 		 */
 		get<T>(section: string, defaultValue: T): T;
 
@@ -5950,7 +6390,7 @@ declare module 'vscode' {
 		 * Check if this configuration has a certain value.
 		 *
 		 * @param section Configuration name, supports _dotted_ names.
-		 * @return `true` if the section doesn't resolve to `undefined`.
+		 * @returns `true` if the section doesn't resolve to `undefined`.
 		 */
 		has(section: string): boolean;
 
@@ -5966,21 +6406,58 @@ declare module 'vscode' {
 		 * (`editor.fontSize` vs `editor`) otherwise no result is returned.
 		 *
 		 * @param section Configuration name, supports _dotted_ names.
-		 * @return Information about a configuration setting or `undefined`.
+		 * @returns Information about a configuration setting or `undefined`.
 		 */
 		inspect<T>(section: string): {
+
+			/**
+			 * The fully qualified key of the configuration value
+			 */
 			key: string;
 
+			/**
+			 * The default value which is used when no other value is defined
+			 */
 			defaultValue?: T;
+
+			/**
+			 * The global or installation-wide value.
+			 */
 			globalValue?: T;
+
+			/**
+			 * The workspace-specific value.
+			 */
 			workspaceValue?: T;
+
+			/**
+			 * The workpace-folder-specific value.
+			 */
 			workspaceFolderValue?: T;
 
+			/**
+			 * Language specific default value when this configuration value is created for a {@link ConfigurationScope language scope}.
+			 */
 			defaultLanguageValue?: T;
+
+			/**
+			 * Language specific global value when this configuration value is created for a {@link ConfigurationScope language scope}.
+			 */
 			globalLanguageValue?: T;
+
+			/**
+			 * Language specific workspace value when this configuration value is created for a {@link ConfigurationScope language scope}.
+			 */
 			workspaceLanguageValue?: T;
+
+			/**
+			 * Language specific workspace-folder value when this configuration value is created for a {@link ConfigurationScope language scope}.
+			 */
 			workspaceFolderLanguageValue?: T;
 
+			/**
+			 * All language identifiers for which this configuration is defined.
+			 */
 			languageIds?: string[];
 
 		} | undefined;
@@ -6317,9 +6794,21 @@ declare module 'vscode' {
 	/**
 	 * Represents the severity of a language status item.
 	 */
+	/**
+	 * Represents the severity level of a language status.
+	 */
 	export enum LanguageStatusSeverity {
+		/**
+		 * Informational severity level.
+		 */
 		Information = 0,
+		/**
+		 * Warning severity level.
+		 */
 		Warning = 1,
+		/**
+		 * Error severity level.
+		 */
 		Error = 2
 	}
 
@@ -6884,7 +7373,7 @@ declare module 'vscode' {
 		 * that could have problems when asynchronous usage may overlap.
 		 * @param context Information about what links are being provided for.
 		 * @param token A cancellation token.
-		 * @return A list of terminal links for the given line.
+		 * @returns A list of terminal links for the given line.
 		 */
 		provideTerminalLinks(context: TerminalLinkContext, token: CancellationToken): ProviderResult<T[]>;
 
@@ -7094,7 +7583,7 @@ declare module 'vscode' {
 		/**
 		 * Activates this extension and returns its public API.
 		 *
-		 * @return A promise that will resolve when this extension has been activated.
+		 * @returns A promise that will resolve when this extension has been activated.
 		 */
 		activate(): Thenable<T>;
 	}
@@ -7138,7 +7627,12 @@ declare module 'vscode' {
 		 *
 		 * *Note* that asynchronous dispose-functions aren't awaited.
 		 */
-		readonly subscriptions: { dispose(): any }[];
+		readonly subscriptions: {
+			/**
+			 * Function to clean up resources.
+			 */
+			dispose(): any;
+		}[];
 
 		/**
 		 * A memento object that stores state in the context
@@ -7197,7 +7691,7 @@ declare module 'vscode' {
 		 * {@linkcode ExtensionContext.extensionUri extensionUri}, e.g. `vscode.Uri.joinPath(context.extensionUri, relativePath);`
 		 *
 		 * @param relativePath A relative path to a resource contained in the extension.
-		 * @return The absolute path of the resource.
+		 * @returns The absolute path of the resource.
 		 */
 		asAbsolutePath(relativePath: string): string;
 
@@ -7291,7 +7785,7 @@ declare module 'vscode' {
 		/**
 		 * Returns the stored keys.
 		 *
-		 * @return The stored keys.
+		 * @returns The stored keys.
 		 */
 		keys(): readonly string[];
 
@@ -7299,7 +7793,7 @@ declare module 'vscode' {
 		 * Return a value.
 		 *
 		 * @param key A string.
-		 * @return The stored value or `undefined`.
+		 * @returns The stored value or `undefined`.
 		 */
 		get<T>(key: string): T | undefined;
 
@@ -7309,7 +7803,7 @@ declare module 'vscode' {
 		 * @param key A string.
 		 * @param defaultValue A value that should be returned when there is no
 		 * value (`undefined`) with the given key.
-		 * @return The stored value or the defaultValue.
+		 * @returns The stored value or the defaultValue.
 		 */
 		get<T>(key: string, defaultValue: T): T;
 
@@ -7371,9 +7865,21 @@ declare module 'vscode' {
 	 * Represents a color theme kind.
 	 */
 	export enum ColorThemeKind {
+		/**
+		 * A light color theme.
+		 */
 		Light = 1,
+		/**
+		 * A dark color theme.
+		 */
 		Dark = 2,
+		/**
+		 * A dark high contrast color theme.
+		 */
 		HighContrast = 3,
+		/**
+		 * A light high contrast color theme.
+		 */
 		HighContrastLight = 4
 	}
 
@@ -7512,6 +8018,12 @@ declare module 'vscode' {
 		 */
 		readonly id: string;
 
+		/**
+		 * Private constructor
+		 *
+		 * @param id Identifier of a task group.
+		 * @param label The human-readable name of a task group.
+		 */
 		private constructor(id: string, label: string);
 	}
 
@@ -7715,6 +8227,9 @@ declare module 'vscode' {
 		quoting: ShellQuoting;
 	}
 
+	/**
+	 * Represents a task execution that happens inside a shell.
+	 */
 	export class ShellExecution {
 		/**
 		 * Creates a shell execution with a full command line.
@@ -7904,7 +8419,7 @@ declare module 'vscode' {
 		/**
 		 * Provides tasks.
 		 * @param token A cancellation token.
-		 * @return an array of tasks
+		 * @returns an array of tasks
 		 */
 		provideTasks(token: CancellationToken): ProviderResult<T[]>;
 
@@ -7923,7 +8438,7 @@ declare module 'vscode' {
 		 *
 		 * @param task The task to resolve.
 		 * @param token A cancellation token.
-		 * @return The resolved task
+		 * @returns The resolved task
 		 */
 		resolveTask(task: T, token: CancellationToken): ProviderResult<T>;
 	}
@@ -8004,6 +8519,9 @@ declare module 'vscode' {
 		readonly exitCode: number | undefined;
 	}
 
+	/**
+	 * A task filter denotes tasks by their version and types
+	 */
 	export interface TaskFilter {
 		/**
 		 * The task version as used in the tasks.json file.
@@ -8027,7 +8545,7 @@ declare module 'vscode' {
 		 *
 		 * @param type The task kind type this provider is registered for.
 		 * @param provider A task provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
 
@@ -8037,6 +8555,7 @@ declare module 'vscode' {
 		 * contributed through extensions.
 		 *
 		 * @param filter Optional filter to select tasks of a certain type or version.
+		 * @returns A thenable that resolves to an array of tasks.
 		 */
 		export function fetchTasks(filter?: TaskFilter): Thenable<Task[]>;
 
@@ -8049,6 +8568,7 @@ declare module 'vscode' {
 		 * In such an environment, only CustomExecution tasks can be run.
 		 *
 		 * @param task the task to execute
+		 * @returns A thenable that resolves to a task execution.
 		 */
 		export function executeTask(task: Task): Thenable<TaskExecution>;
 
@@ -8106,6 +8626,9 @@ declare module 'vscode' {
 		SymbolicLink = 64
 	}
 
+	/**
+	 * Permissions of a file.
+	 */
 	export enum FilePermission {
 		/**
 		 * The file is readonly.
@@ -8303,7 +8826,16 @@ declare module 'vscode' {
 		 * @param options Configures the watch.
 		 * @returns A disposable that tells the provider to stop watching the `uri`.
 		 */
-		watch(uri: Uri, options: { readonly recursive: boolean; readonly excludes: readonly string[] }): Disposable;
+		watch(uri: Uri, options: {
+			/**
+			 * When enabled also watch subfolders.
+			 */
+			readonly recursive: boolean;
+			/**
+			 * A list of paths and pattern to exclude from watching.
+			 */
+			readonly excludes: readonly string[];
+		}): Disposable;
 
 		/**
 		 * Retrieve metadata about a file.
@@ -8313,7 +8845,7 @@ declare module 'vscode' {
 		 * `FileType.SymbolicLink | FileType.Directory`.
 		 *
 		 * @param uri The uri of the file to retrieve metadata about.
-		 * @return The file metadata about the file.
+		 * @returns The file metadata about the file.
 		 * @throws {@linkcode FileSystemError.FileNotFound FileNotFound} when `uri` doesn't exist.
 		 */
 		stat(uri: Uri): FileStat | Thenable<FileStat>;
@@ -8322,7 +8854,7 @@ declare module 'vscode' {
 		 * Retrieve all entries of a {@link FileType.Directory directory}.
 		 *
 		 * @param uri The uri of the folder.
-		 * @return An array of name/type-tuples or a thenable that resolves to such.
+		 * @returns An array of name/type-tuples or a thenable that resolves to such.
 		 * @throws {@linkcode FileSystemError.FileNotFound FileNotFound} when `uri` doesn't exist.
 		 */
 		readDirectory(uri: Uri): [string, FileType][] | Thenable<[string, FileType][]>;
@@ -8341,7 +8873,7 @@ declare module 'vscode' {
 		 * Read the entire contents of a file.
 		 *
 		 * @param uri The uri of the file.
-		 * @return An array of bytes or a thenable that resolves to such.
+		 * @returns An array of bytes or a thenable that resolves to such.
 		 * @throws {@linkcode FileSystemError.FileNotFound FileNotFound} when `uri` doesn't exist.
 		 */
 		readFile(uri: Uri): Uint8Array | Thenable<Uint8Array>;
@@ -8357,7 +8889,16 @@ declare module 'vscode' {
 		 * @throws {@linkcode FileSystemError.FileExists FileExists} when `uri` already exists, `create` is set but `overwrite` is not set.
 		 * @throws {@linkcode FileSystemError.NoPermissions NoPermissions} when permissions aren't sufficient.
 		 */
-		writeFile(uri: Uri, content: Uint8Array, options: { readonly create: boolean; readonly overwrite: boolean }): void | Thenable<void>;
+		writeFile(uri: Uri, content: Uint8Array, options: {
+			/**
+			 * Create the file if it does not exist already.
+			 */
+			readonly create: boolean;
+			/**
+			 * Overwrite the file if it does exist.
+			 */
+			readonly overwrite: boolean;
+		}): void | Thenable<void>;
 
 		/**
 		 * Delete a file.
@@ -8367,7 +8908,12 @@ declare module 'vscode' {
 		 * @throws {@linkcode FileSystemError.FileNotFound FileNotFound} when `uri` doesn't exist.
 		 * @throws {@linkcode FileSystemError.NoPermissions NoPermissions} when permissions aren't sufficient.
 		 */
-		delete(uri: Uri, options: { readonly recursive: boolean }): void | Thenable<void>;
+		delete(uri: Uri, options: {
+			/**
+			 * Delete the content recursively if a folder is denoted.
+			 */
+			readonly recursive: boolean;
+		}): void | Thenable<void>;
 
 		/**
 		 * Rename a file or folder.
@@ -8380,7 +8926,12 @@ declare module 'vscode' {
 		 * @throws {@linkcode FileSystemError.FileExists FileExists} when `newUri` exists and when the `overwrite` option is not `true`.
 		 * @throws {@linkcode FileSystemError.NoPermissions NoPermissions} when permissions aren't sufficient.
 		 */
-		rename(oldUri: Uri, newUri: Uri, options: { readonly overwrite: boolean }): void | Thenable<void>;
+		rename(oldUri: Uri, newUri: Uri, options: {
+			/**
+			 * Overwrite the file if it does exist.
+			 */
+			readonly overwrite: boolean;
+		}): void | Thenable<void>;
 
 		/**
 		 * Copy files or folders. Implementing this function is optional but it will speedup
@@ -8394,7 +8945,12 @@ declare module 'vscode' {
 		 * @throws {@linkcode FileSystemError.FileExists FileExists} when `destination` exists and when the `overwrite` option is not `true`.
 		 * @throws {@linkcode FileSystemError.NoPermissions NoPermissions} when permissions aren't sufficient.
 		 */
-		copy?(source: Uri, destination: Uri, options: { readonly overwrite: boolean }): void | Thenable<void>;
+		copy?(source: Uri, destination: Uri, options: {
+			/**
+			 * Overwrite the file if it does exist.
+			 */
+			readonly overwrite: boolean;
+		}): void | Thenable<void>;
 	}
 
 	/**
@@ -8411,7 +8967,7 @@ declare module 'vscode' {
 		 * Retrieve metadata about a file.
 		 *
 		 * @param uri The uri of the file to retrieve metadata about.
-		 * @return The file metadata about the file.
+		 * @returns The file metadata about the file.
 		 */
 		stat(uri: Uri): Thenable<FileStat>;
 
@@ -8419,7 +8975,7 @@ declare module 'vscode' {
 		 * Retrieve all entries of a {@link FileType.Directory directory}.
 		 *
 		 * @param uri The uri of the folder.
-		 * @return An array of name/type-tuples or a thenable that resolves to such.
+		 * @returns An array of name/type-tuples or a thenable that resolves to such.
 		 */
 		readDirectory(uri: Uri): Thenable<[string, FileType][]>;
 
@@ -8437,7 +8993,7 @@ declare module 'vscode' {
 		 * Read the entire contents of a file.
 		 *
 		 * @param uri The uri of the file.
-		 * @return An array of bytes or a thenable that resolves to such.
+		 * @returns An array of bytes or a thenable that resolves to such.
 		 */
 		readFile(uri: Uri): Thenable<Uint8Array>;
 
@@ -8455,7 +9011,16 @@ declare module 'vscode' {
 		 * @param uri The resource that is to be deleted.
 		 * @param options Defines if trash can should be used and if deletion of folders is recursive
 		 */
-		delete(uri: Uri, options?: { recursive?: boolean; useTrash?: boolean }): Thenable<void>;
+		delete(uri: Uri, options?: {
+			/**
+			 * Delete the content recursively if a folder is denoted.
+			 */
+			recursive?: boolean;
+			/**
+			 * Use the os's trashcan instead of permanently deleting files whenever possible.
+			 */
+			useTrash?: boolean;
+		}): Thenable<void>;
 
 		/**
 		 * Rename a file or folder.
@@ -8464,7 +9029,12 @@ declare module 'vscode' {
 		 * @param target The new location.
 		 * @param options Defines if existing files should be overwritten.
 		 */
-		rename(source: Uri, target: Uri, options?: { overwrite?: boolean }): Thenable<void>;
+		rename(source: Uri, target: Uri, options?: {
+			/**
+			 * Overwrite the file if it does exist.
+			 */
+			overwrite?: boolean;
+		}): Thenable<void>;
 
 		/**
 		 * Copy files or folders.
@@ -8473,7 +9043,12 @@ declare module 'vscode' {
 		 * @param target The destination location.
 		 * @param options Defines if existing files should be overwritten.
 		 */
-		copy(source: Uri, target: Uri, options?: { overwrite?: boolean }): Thenable<void>;
+		copy(source: Uri, target: Uri, options?: {
+			/**
+			 * Overwrite the file if it does exist.
+			 */
+			overwrite?: boolean;
+		}): Thenable<void>;
 
 		/**
 		 * Check if a given file system supports writing files.
@@ -8484,7 +9059,7 @@ declare module 'vscode' {
 		 *
 		 * @param scheme The scheme of the filesystem, for example `file` or `git`.
 		 *
-		 * @return `true` if the file system supports writing, `false` if it does not
+		 * @returns `true` if the file system supports writing, `false` if it does not
 		 * support writing (i.e. it is readonly), and `undefined` if the editor does not
 		 * know about the filesystem.
 		 */
@@ -8622,7 +9197,7 @@ declare module 'vscode' {
 		 *   efficiently transferred to the webview and will also be correctly recreated inside
 		 *   of the webview.
 		 *
-		 * @return A promise that resolves when the message is posted to a webview or when it is
+		 * @returns A promise that resolves when the message is posted to a webview or when it is
 		 * dropped because the message was not deliverable.
 		 *
 		 *   Returns `true` if the message was posted to the webview. Messages can only be posted to
@@ -8709,7 +9284,16 @@ declare module 'vscode' {
 		/**
 		 * Icon for the panel shown in UI.
 		 */
-		iconPath?: Uri | { readonly light: Uri; readonly dark: Uri };
+		iconPath?: Uri | {
+			/**
+			 * The icon path for the light theme.
+			 */
+			readonly light: Uri;
+			/**
+			 * The icon path for the dark theme.
+			 */
+			readonly dark: Uri;
+		};
 
 		/**
 		 * {@linkcode Webview} belonging to the panel.
@@ -8826,7 +9410,7 @@ declare module 'vscode' {
 		 * serializer must restore the webview's `.html` and hook up all webview events.
 		 * @param state Persisted state from the webview content.
 		 *
-		 * @return Thenable indicating that the webview has been fully restored.
+		 * @returns Thenable indicating that the webview has been fully restored.
 		 */
 		deserializeWebviewPanel(webviewPanel: WebviewPanel, state: T): Thenable<void>;
 	}
@@ -8955,7 +9539,7 @@ declare module 'vscode' {
 		 * @param context Additional metadata about the view being resolved.
 		 * @param token Cancellation token indicating that the view being provided is no longer needed.
 		 *
-		 * @return Optional thenable indicating that the view has been fully resolved.
+		 * @returns Optional thenable indicating that the view has been fully resolved.
 		 */
 		resolveWebviewView(webviewView: WebviewView, context: WebviewViewResolveContext, token: CancellationToken): Thenable<void> | void;
 	}
@@ -8986,7 +9570,7 @@ declare module 'vscode' {
 		 *
 		 * @param token A cancellation token that indicates the result is no longer needed.
 		 *
-		 * @return Thenable indicating that the custom editor has been resolved.
+		 * @returns Thenable indicating that the custom editor has been resolved.
 		 */
 		resolveCustomTextEditor(document: TextDocument, webviewPanel: WebviewPanel, token: CancellationToken): Thenable<void> | void;
 	}
@@ -9145,7 +9729,7 @@ declare module 'vscode' {
 		 * @param openContext Additional information about the opening custom document.
 		 * @param token A cancellation token that indicates the result is no longer needed.
 		 *
-		 * @return The custom document.
+		 * @returns The custom document.
 		 */
 		openCustomDocument(uri: Uri, openContext: CustomDocumentOpenContext, token: CancellationToken): Thenable<T> | T;
 
@@ -9164,7 +9748,7 @@ declare module 'vscode' {
 		 *
 		 * @param token A cancellation token that indicates the result is no longer needed.
 		 *
-		 * @return Optional thenable indicating that the custom editor has been resolved.
+		 * @returns Optional thenable indicating that the custom editor has been resolved.
 		 */
 		resolveCustomEditor(document: T, webviewPanel: WebviewPanel, token: CancellationToken): Thenable<void> | void;
 	}
@@ -9216,7 +9800,7 @@ declare module 'vscode' {
 		 * @param document Document to save.
 		 * @param cancellation Token that signals the save is no longer required (for example, if another save was triggered).
 		 *
-		 * @return Thenable signaling that saving has completed.
+		 * @returns Thenable signaling that saving has completed.
 		 */
 		saveCustomDocument(document: T, cancellation: CancellationToken): Thenable<void>;
 
@@ -9232,7 +9816,7 @@ declare module 'vscode' {
 		 * @param destination Location to save to.
 		 * @param cancellation Token that signals the save is no longer required.
 		 *
-		 * @return Thenable signaling that saving has completed.
+		 * @returns Thenable signaling that saving has completed.
 		 */
 		saveCustomDocumentAs(document: T, destination: Uri, cancellation: CancellationToken): Thenable<void>;
 
@@ -9249,7 +9833,7 @@ declare module 'vscode' {
 		 * @param document Document to revert.
 		 * @param cancellation Token that signals the revert is no longer required.
 		 *
-		 * @return Thenable signaling that the change has completed.
+		 * @returns Thenable signaling that the change has completed.
 		 */
 		revertCustomDocument(document: T, cancellation: CancellationToken): Thenable<void>;
 
@@ -9517,7 +10101,7 @@ declare module 'vscode' {
 		 * Any other scheme will be handled as if the provided URI is a workspace URI. In that case, the method will return
 		 * a URI which, when handled, will make the editor open the workspace.
 		 *
-		 * @return A uri that can be used on the client machine.
+		 * @returns A uri that can be used on the client machine.
 		 */
 		export function asExternalUri(target: Uri): Thenable<Uri>;
 
@@ -9580,7 +10164,7 @@ declare module 'vscode' {
 		 * @param command A unique identifier for the command.
 		 * @param callback A command handler function.
 		 * @param thisArg The `this` context used when invoking the handler function.
-		 * @return Disposable which unregisters this command on disposal.
+		 * @returns Disposable which unregisters this command on disposal.
 		 */
 		export function registerCommand(command: string, callback: (...args: any[]) => any, thisArg?: any): Disposable;
 
@@ -9597,7 +10181,7 @@ declare module 'vscode' {
 		 * @param command A unique identifier for the command.
 		 * @param callback A command handler function with access to an {@link TextEditor editor} and an {@link TextEditorEdit edit}.
 		 * @param thisArg The `this` context used when invoking the handler function.
-		 * @return Disposable which unregisters this command on disposal.
+		 * @returns Disposable which unregisters this command on disposal.
 		 */
 		export function registerTextEditorCommand(command: string, callback: (textEditor: TextEditor, edit: TextEditorEdit, ...args: any[]) => void, thisArg?: any): Disposable;
 
@@ -9612,7 +10196,7 @@ declare module 'vscode' {
 		 *
 		 * @param command Identifier of the command to execute.
 		 * @param rest Parameters passed to the command function.
-		 * @return A thenable that resolves to the returned value of the given command. Returns `undefined` when
+		 * @returns A thenable that resolves to the returned value of the given command. Returns `undefined` when
 		 * the command handler function doesn't return anything.
 		 */
 		export function executeCommand<T = unknown>(command: string, ...rest: any[]): Thenable<T>;
@@ -9622,7 +10206,7 @@ declare module 'vscode' {
 		 * treated as internal commands.
 		 *
 		 * @param filterInternal Set `true` to not see internal commands (starting with an underscore)
-		 * @return Thenable that resolves to a list of command ids.
+		 * @returns Thenable that resolves to a list of command ids.
 		 */
 		export function getCommands(filterInternal?: boolean): Thenable<string[]>;
 	}
@@ -9801,7 +10385,7 @@ declare module 'vscode' {
 		 * Columns that do not exist will be created as needed up to the maximum of {@linkcode ViewColumn.Nine}. Use {@linkcode ViewColumn.Beside}
 		 * to open the editor to the side of the currently active one.
 		 * @param preserveFocus When `true` the editor will not take focus.
-		 * @return A promise that resolves to an {@link TextEditor editor}.
+		 * @returns A promise that resolves to an {@link TextEditor editor}.
 		 */
 		export function showTextDocument(document: TextDocument, column?: ViewColumn, preserveFocus?: boolean): Thenable<TextEditor>;
 
@@ -9811,7 +10395,7 @@ declare module 'vscode' {
 		 *
 		 * @param document A text document to be shown.
 		 * @param options {@link TextDocumentShowOptions Editor options} to configure the behavior of showing the {@link TextEditor editor}.
-		 * @return A promise that resolves to an {@link TextEditor editor}.
+		 * @returns A promise that resolves to an {@link TextEditor editor}.
 		 */
 		export function showTextDocument(document: TextDocument, options?: TextDocumentShowOptions): Thenable<TextEditor>;
 
@@ -9822,7 +10406,7 @@ declare module 'vscode' {
 		 *
 		 * @param uri A resource identifier.
 		 * @param options {@link TextDocumentShowOptions Editor options} to configure the behavior of showing the {@link TextEditor editor}.
-		 * @return A promise that resolves to an {@link TextEditor editor}.
+		 * @returns A promise that resolves to an {@link TextEditor editor}.
 		 */
 		export function showTextDocument(uri: Uri, options?: TextDocumentShowOptions): Thenable<TextEditor>;
 
@@ -9832,7 +10416,7 @@ declare module 'vscode' {
 		 * @param document A text document to be shown.
 		 * @param options {@link NotebookDocumentShowOptions Editor options} to configure the behavior of showing the {@link NotebookEditor notebook editor}.
 		 *
-		 * @return A promise that resolves to an {@link NotebookEditor notebook editor}.
+		 * @returns A promise that resolves to an {@link NotebookEditor notebook editor}.
 		 */
 		export function showNotebookDocument(document: NotebookDocument, options?: NotebookDocumentShowOptions): Thenable<NotebookEditor>;
 
@@ -9840,7 +10424,7 @@ declare module 'vscode' {
 		 * Create a TextEditorDecorationType that can be used to add decorations to text editors.
 		 *
 		 * @param options Rendering options for the decoration type.
-		 * @return A new decoration type instance.
+		 * @returns A new decoration type instance.
 		 */
 		export function createTextEditorDecorationType(options: DecorationRenderOptions): TextEditorDecorationType;
 
@@ -9850,7 +10434,7 @@ declare module 'vscode' {
 		 *
 		 * @param message The message to show.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showInformationMessage<T extends string>(message: string, ...items: T[]): Thenable<T | undefined>;
 
@@ -9861,7 +10445,7 @@ declare module 'vscode' {
 		 * @param message The message to show.
 		 * @param options Configures the behaviour of the message.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showInformationMessage<T extends string>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
@@ -9872,7 +10456,7 @@ declare module 'vscode' {
 		 *
 		 * @param message The message to show.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showInformationMessage<T extends MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>;
 
@@ -9884,7 +10468,7 @@ declare module 'vscode' {
 		 * @param message The message to show.
 		 * @param options Configures the behaviour of the message.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showInformationMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
@@ -9895,7 +10479,7 @@ declare module 'vscode' {
 		 *
 		 * @param message The message to show.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showWarningMessage<T extends string>(message: string, ...items: T[]): Thenable<T | undefined>;
 
@@ -9907,7 +10491,7 @@ declare module 'vscode' {
 		 * @param message The message to show.
 		 * @param options Configures the behaviour of the message.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showWarningMessage<T extends string>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
@@ -9918,7 +10502,7 @@ declare module 'vscode' {
 		 *
 		 * @param message The message to show.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showWarningMessage<T extends MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>;
 
@@ -9930,7 +10514,7 @@ declare module 'vscode' {
 		 * @param message The message to show.
 		 * @param options Configures the behaviour of the message.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showWarningMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
@@ -9941,7 +10525,7 @@ declare module 'vscode' {
 		 *
 		 * @param message The message to show.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showErrorMessage<T extends string>(message: string, ...items: T[]): Thenable<T | undefined>;
 
@@ -9953,7 +10537,7 @@ declare module 'vscode' {
 		 * @param message The message to show.
 		 * @param options Configures the behaviour of the message.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showErrorMessage<T extends string>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
@@ -9964,7 +10548,7 @@ declare module 'vscode' {
 		 *
 		 * @param message The message to show.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showErrorMessage<T extends MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>;
 
@@ -9976,7 +10560,7 @@ declare module 'vscode' {
 		 * @param message The message to show.
 		 * @param options Configures the behaviour of the message.
 		 * @param items A set of items that will be rendered as actions in the message.
-		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 * @returns A thenable that resolves to the selected item or `undefined` when being dismissed.
 		 */
 		export function showErrorMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
@@ -9986,9 +10570,9 @@ declare module 'vscode' {
 		 * @param items An array of strings, or a promise that resolves to an array of strings.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selected items or `undefined`.
+		 * @returns A promise that resolves to the selected items or `undefined`.
 		 */
-		export function showQuickPick(items: readonly string[] | Thenable<readonly string[]>, options: QuickPickOptions & { canPickMany: true }, token?: CancellationToken): Thenable<string[] | undefined>;
+		export function showQuickPick(items: readonly string[] | Thenable<readonly string[]>, options: QuickPickOptions & { /** literal-type defines return type */canPickMany: true }, token?: CancellationToken): Thenable<string[] | undefined>;
 
 		/**
 		 * Shows a selection list.
@@ -9996,7 +10580,7 @@ declare module 'vscode' {
 		 * @param items An array of strings, or a promise that resolves to an array of strings.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selection or `undefined`.
+		 * @returns A promise that resolves to the selection or `undefined`.
 		 */
 		export function showQuickPick(items: readonly string[] | Thenable<readonly string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 
@@ -10006,9 +10590,9 @@ declare module 'vscode' {
 		 * @param items An array of items, or a promise that resolves to an array of items.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selected items or `undefined`.
+		 * @returns A promise that resolves to the selected items or `undefined`.
 		 */
-		export function showQuickPick<T extends QuickPickItem>(items: readonly T[] | Thenable<readonly T[]>, options: QuickPickOptions & { canPickMany: true }, token?: CancellationToken): Thenable<T[] | undefined>;
+		export function showQuickPick<T extends QuickPickItem>(items: readonly T[] | Thenable<readonly T[]>, options: QuickPickOptions & { /** literal-type defines return type */ canPickMany: true }, token?: CancellationToken): Thenable<T[] | undefined>;
 
 		/**
 		 * Shows a selection list.
@@ -10016,7 +10600,7 @@ declare module 'vscode' {
 		 * @param items An array of items, or a promise that resolves to an array of items.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selected item or `undefined`.
+		 * @returns A promise that resolves to the selected item or `undefined`.
 		 */
 		export function showQuickPick<T extends QuickPickItem>(items: readonly T[] | Thenable<readonly T[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<T | undefined>;
 
@@ -10025,7 +10609,7 @@ declare module 'vscode' {
 		 * Returns `undefined` if no folder is open.
 		 *
 		 * @param options Configures the behavior of the workspace folder list.
-		 * @return A promise that resolves to the workspace folder or `undefined`.
+		 * @returns A promise that resolves to the workspace folder or `undefined`.
 		 */
 		export function showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions): Thenable<WorkspaceFolder | undefined>;
 
@@ -10056,7 +10640,7 @@ declare module 'vscode' {
 		 *
 		 * @param options Configures the behavior of the input box.
 		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to a string the user provided or to `undefined` in case of dismissal.
+		 * @returns A promise that resolves to a string the user provided or to `undefined` in case of dismissal.
 		 */
 		export function showInputBox(options?: InputBoxOptions, token?: CancellationToken): Thenable<string | undefined>;
 
@@ -10068,7 +10652,7 @@ declare module 'vscode' {
 		 * is easier to use. {@link window.createQuickPick} should be used
 		 * when {@link window.showQuickPick} does not offer the required flexibility.
 		 *
-		 * @return A new {@link QuickPick}.
+		 * @returns A new {@link QuickPick}.
 		 */
 		export function createQuickPick<T extends QuickPickItem>(): QuickPick<T>;
 
@@ -10079,7 +10663,7 @@ declare module 'vscode' {
 		 * is easier to use. {@link window.createInputBox} should be used
 		 * when {@link window.showInputBox} does not offer the required flexibility.
 		 *
-		 * @return A new {@link InputBox}.
+		 * @returns A new {@link InputBox}.
 		 */
 		export function createInputBox(): InputBox;
 
@@ -10092,6 +10676,7 @@ declare module 'vscode' {
 		 *
 		 * @param name Human-readable string which will be used to represent the channel in the UI.
 		 * @param languageId The identifier of the language associated with the channel.
+		 * @returns A new output channel.
 		 */
 		export function createOutputChannel(name: string, languageId?: string): OutputChannel;
 
@@ -10100,8 +10685,9 @@ declare module 'vscode' {
 		 *
 		 * @param name Human-readable string which will be used to represent the channel in the UI.
 		 * @param options Options for the log output channel.
+		 * @returns A new log output channel.
 		 */
-		export function createOutputChannel(name: string, options: { log: true }): LogOutputChannel;
+		export function createOutputChannel(name: string, options: { /** literal-type defines return type */log: true }): LogOutputChannel;
 
 		/**
 		 * Create and show a new webview panel.
@@ -10111,9 +10697,18 @@ declare module 'vscode' {
 		 * @param showOptions Where to show the webview in the editor. If preserveFocus is set, the new webview will not take focus.
 		 * @param options Settings for the new panel.
 		 *
-		 * @return New webview panel.
+		 * @returns New webview panel.
 		 */
-		export function createWebviewPanel(viewType: string, title: string, showOptions: ViewColumn | { readonly viewColumn: ViewColumn; readonly preserveFocus?: boolean }, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
+		export function createWebviewPanel(viewType: string, title: string, showOptions: ViewColumn | {
+			/**
+			 * The view column in which the {@link WebviewPanel} should be shown.
+			 */
+			readonly viewColumn: ViewColumn;
+			/**
+			 * An optional flag that when `true` will stop the panel from taking focus.
+			 */
+			readonly preserveFocus?: boolean;
+		}, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
 
 		/**
 		 * Set a message to the status bar. This is a short hand for the more powerful
@@ -10121,7 +10716,7 @@ declare module 'vscode' {
 		 *
 		 * @param text The message to show, supports icon substitution as in status bar {@link StatusBarItem.text items}.
 		 * @param hideAfterTimeout Timeout in milliseconds after which the message will be disposed.
-		 * @return A disposable which hides the status bar message.
+		 * @returns A disposable which hides the status bar message.
 		 */
 		export function setStatusBarMessage(text: string, hideAfterTimeout: number): Disposable;
 
@@ -10131,7 +10726,7 @@ declare module 'vscode' {
 		 *
 		 * @param text The message to show, supports icon substitution as in status bar {@link StatusBarItem.text items}.
 		 * @param hideWhenDone Thenable on which completion (resolve or reject) the message will be disposed.
-		 * @return A disposable which hides the status bar message.
+		 * @returns A disposable which hides the status bar message.
 		 */
 		export function setStatusBarMessage(text: string, hideWhenDone: Thenable<any>): Disposable;
 
@@ -10143,7 +10738,7 @@ declare module 'vscode' {
 		 * longer used.
 		 *
 		 * @param text The message to show, supports icon substitution as in status bar {@link StatusBarItem.text items}.
-		 * @return A disposable which hides the status bar message.
+		 * @returns A disposable which hides the status bar message.
 		 */
 		export function setStatusBarMessage(text: string): Disposable;
 
@@ -10155,7 +10750,7 @@ declare module 'vscode' {
 		 *
 		 * @param task A callback returning a promise. Progress increments can be reported with
 		 * the provided {@link Progress}-object.
-		 * @return The thenable the task did return.
+		 * @returns The thenable the task did return.
 		 */
 		export function withScmProgress<R>(task: (progress: Progress<number>) => Thenable<R>): Thenable<R>;
 
@@ -10164,6 +10759,7 @@ declare module 'vscode' {
 		 * and while the promise it returned isn't resolved nor rejected. The location at which
 		 * progress should show (and other details) is defined via the passed {@linkcode ProgressOptions}.
 		 *
+		 * @param options A {@linkcode ProgressOptions}-object describing the options to use for showing progress, like its location
 		 * @param task A callback returning a promise. Progress state can be reported with
 		 * the provided {@link Progress}-object.
 		 *
@@ -10176,9 +10772,18 @@ declare module 'vscode' {
 		 * Note that currently only `ProgressLocation.Notification` is supporting to show a cancel button to cancel the
 		 * long running operation.
 		 *
-		 * @return The thenable the task-callback returned.
+		 * @returns The thenable the task-callback returned.
 		 */
-		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; increment?: number }>, token: CancellationToken) => Thenable<R>): Thenable<R>;
+		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{
+			/**
+			 * A progress message that represents a chunk of work
+			 */
+			message?: string;
+			/**
+			 * An increment for discrete progress. Increments will be summed up until 100% is reached
+			 */
+			increment?: number;
+		}>, token: CancellationToken) => Thenable<R>): Thenable<R>;
 
 		/**
 		 * Creates a status bar {@link StatusBarItem item}.
@@ -10186,7 +10791,7 @@ declare module 'vscode' {
 		 * @param id The identifier of the item. Must be unique within the extension.
 		 * @param alignment The alignment of the item.
 		 * @param priority The priority of the item. Higher values mean the item should be shown more to the left.
-		 * @return A new status bar item.
+		 * @returns A new status bar item.
 		 */
 		export function createStatusBarItem(id: string, alignment?: StatusBarAlignment, priority?: number): StatusBarItem;
 
@@ -10196,7 +10801,7 @@ declare module 'vscode' {
 		 * @see {@link createStatusBarItem} for creating a status bar item with an identifier.
 		 * @param alignment The alignment of the item.
 		 * @param priority The priority of the item. Higher values mean the item should be shown more to the left.
-		 * @return A new status bar item.
+		 * @returns A new status bar item.
 		 */
 		export function createStatusBarItem(alignment?: StatusBarAlignment, priority?: number): StatusBarItem;
 
@@ -10209,7 +10814,7 @@ declare module 'vscode' {
 		 * @param shellArgs Optional args for the custom shell executable. A string can be used on Windows only which
 		 * allows specifying shell args in
 		 * [command-line format](https://msdn.microsoft.com/en-au/08dfcab2-eb6e-49a4-80eb-87d4076c98c6).
-		 * @return A new Terminal.
+		 * @returns A new Terminal.
 		 * @throws When running in an environment where a new process cannot be started.
 		 */
 		export function createTerminal(name?: string, shellPath?: string, shellArgs?: readonly string[] | string): Terminal;
@@ -10218,7 +10823,7 @@ declare module 'vscode' {
 		 * Creates a {@link Terminal} with a backing shell process.
 		 *
 		 * @param options A TerminalOptions object describing the characteristics of the new terminal.
-		 * @return A new Terminal.
+		 * @returns A new Terminal.
 		 * @throws When running in an environment where a new process cannot be started.
 		 */
 		export function createTerminal(options: TerminalOptions): Terminal;
@@ -10228,7 +10833,7 @@ declare module 'vscode' {
 		 *
 		 * @param options An {@link ExtensionTerminalOptions} object describing
 		 * the characteristics of the new terminal.
-		 * @return A new Terminal.
+		 * @returns A new Terminal.
 		 */
 		export function createTerminal(options: ExtensionTerminalOptions): Terminal;
 
@@ -10240,6 +10845,7 @@ declare module 'vscode' {
 		 *
 		 * @param viewId Id of the view contributed using the extension point `views`.
 		 * @param treeDataProvider A {@link TreeDataProvider} that provides tree data for the view
+		 * @returns A {@link Disposable disposable} that unregisters the {@link TreeDataProvider}.
 		 */
 		export function registerTreeDataProvider<T>(viewId: string, treeDataProvider: TreeDataProvider<T>): Disposable;
 
@@ -10271,6 +10877,7 @@ declare module 'vscode' {
 		 * the current extension is about to be handled.
 		 *
 		 * @param handler The uri handler to register for this extension.
+		 * @returns A {@link Disposable disposable} that unregisters the handler.
 		 */
 		export function registerUriHandler(handler: UriHandler): Disposable;
 
@@ -10284,6 +10891,7 @@ declare module 'vscode' {
 		 *
 		 * @param viewType Type of the webview panel that can be serialized.
 		 * @param serializer Webview serializer.
+		 * @returns A {@link Disposable disposable} that unregisters the serializer.
 		 */
 		export function registerWebviewPanelSerializer(viewType: string, serializer: WebviewPanelSerializer): Disposable;
 
@@ -10294,7 +10902,7 @@ declare module 'vscode' {
 		 *   `views` contribution in the package.json.
 		 * @param provider Provider for the webview views.
 		 *
-		 * @return Disposable that unregisters the provider.
+		 * @returns Disposable that unregisters the provider.
 		 */
 		export function registerWebviewViewProvider(viewId: string, provider: WebviewViewProvider, options?: {
 			/**
@@ -10333,7 +10941,7 @@ declare module 'vscode' {
 		 * @param provider Provider that resolves custom editors.
 		 * @param options Options for the provider.
 		 *
-		 * @return Disposable that unregisters the provider.
+		 * @returns Disposable that unregisters the provider.
 		 */
 		export function registerCustomEditorProvider(viewType: string, provider: CustomTextEditorProvider | CustomReadonlyEditorProvider | CustomEditorProvider, options?: {
 			/**
@@ -10361,21 +10969,23 @@ declare module 'vscode' {
 		/**
 		 * Register provider that enables the detection and handling of links within the terminal.
 		 * @param provider The provider that provides the terminal links.
-		 * @return Disposable that unregisters the provider.
+		 * @returns Disposable that unregisters the provider.
 		 */
 		export function registerTerminalLinkProvider(provider: TerminalLinkProvider): Disposable;
 
 		/**
 		 * Registers a provider for a contributed terminal profile.
+		 *
 		 * @param id The ID of the contributed terminal profile.
 		 * @param provider The terminal profile provider.
+		 * @returns A {@link Disposable disposable} that unregisters the provider.
 		 */
 		export function registerTerminalProfileProvider(id: string, provider: TerminalProfileProvider): Disposable;
 		/**
 		 * Register a file decoration provider.
 		 *
 		 * @param provider A {@link FileDecorationProvider}.
-		 * @return A {@link Disposable} that unregisters the provider.
+		 * @returns A {@link Disposable} that unregisters the provider.
 		 */
 		export function registerFileDecorationProvider(provider: FileDecorationProvider): Disposable;
 
@@ -10753,11 +11363,24 @@ declare module 'vscode' {
 		 * In order to not to select, set the option `select` to `false`.
 		 * In order to focus, set the option `focus` to `true`.
 		 * In order to expand the revealed element, set the option `expand` to `true`. To expand recursively set `expand` to the number of levels to expand.
-		 * **NOTE:** You can expand only to 3 levels maximum.
 		 *
-		 * **NOTE:** The {@link TreeDataProvider} that the `TreeView` {@link window.createTreeView is registered with} with must implement {@link TreeDataProvider.getParent getParent} method to access this API.
+		 * * *NOTE:* You can expand only to 3 levels maximum.
+		 * * *NOTE:* The {@link TreeDataProvider} that the `TreeView` {@link window.createTreeView is registered with} with must implement {@link TreeDataProvider.getParent getParent} method to access this API.
 		 */
-		reveal(element: T, options?: { select?: boolean; focus?: boolean; expand?: boolean | number }): Thenable<void>;
+		reveal(element: T, options?: {
+			/**
+			 * If true, then the element will be selected.
+			 */
+			select?: boolean;
+			/**
+			 * If true, then the element will be focused.
+			 */
+			focus?: boolean;
+			/**
+			 * If true, then the element will be expanded. If a number is passed, then up to that number of levels of children will be expanded
+			 */
+			expand?: boolean | number;
+		}): Thenable<void>;
 	}
 
 	/**
@@ -10775,7 +11398,7 @@ declare module 'vscode' {
 		 * Get {@link TreeItem} representation of the `element`
 		 *
 		 * @param element The element for which {@link TreeItem} representation is asked for.
-		 * @return TreeItem representation of the element.
+		 * @returns TreeItem representation of the element.
 		 */
 		getTreeItem(element: T): TreeItem | Thenable<TreeItem>;
 
@@ -10783,7 +11406,7 @@ declare module 'vscode' {
 		 * Get the children of `element` or root if no element is passed.
 		 *
 		 * @param element The element from which the provider gets children. Can be `undefined`.
-		 * @return Children of `element` or root if no element is passed.
+		 * @returns Children of `element` or root if no element is passed.
 		 */
 		getChildren(element?: T): ProviderResult<T[]>;
 
@@ -10794,7 +11417,7 @@ declare module 'vscode' {
 		 * **NOTE:** This method should be implemented in order to access {@link TreeView.reveal reveal} API.
 		 *
 		 * @param element The element for which the parent has to be returned.
-		 * @return Parent of `element`.
+		 * @returns Parent of `element`.
 		 */
 		getParent?(element: T): ProviderResult<T>;
 
@@ -10816,12 +11439,15 @@ declare module 'vscode' {
 		 * @param item Undefined properties of `item` should be set then `item` should be returned.
 		 * @param element The object associated with the TreeItem.
 		 * @param token A cancellation token.
-		 * @return The resolved tree item or a thenable that resolves to such. It is OK to return the given
+		 * @returns The resolved tree item or a thenable that resolves to such. It is OK to return the given
 		 * `item`. When no result is returned, the given `item` will be used.
 		 */
 		resolveTreeItem?(item: TreeItem, element: T, token: CancellationToken): ProviderResult<TreeItem>;
 	}
 
+	/**
+	 * A tree item is an UI element of the tree. Tree items are created by the {@link TreeDataProvider data provider}.
+	 */
 	export class TreeItem {
 		/**
 		 * A human-readable string describing this item. When `falsy`, it is derived from {@link TreeItem.resourceUri resourceUri}.
@@ -10840,7 +11466,16 @@ declare module 'vscode' {
 		 * When `falsy`, {@link ThemeIcon.Folder Folder Theme Icon} is assigned, if item is collapsible otherwise {@link ThemeIcon.File File Theme Icon}.
 		 * When a file or folder {@link ThemeIcon} is specified, icon is derived from the current file icon theme for the specified theme icon using {@link TreeItem.resourceUri resourceUri} (if provided).
 		 */
-		iconPath?: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
+		iconPath?: string | Uri | {
+			/**
+			 * The icon path for the light theme.
+			 */
+			light: string | Uri;
+			/**
+			 * The icon path for the dark theme.
+			 */
+			dark: string | Uri;
+		} | ThemeIcon;
 
 		/**
 		 * A human-readable string which is rendered less prominent.
@@ -10906,7 +11541,20 @@ declare module 'vscode' {
 		 * {@link TreeItemCheckboxState TreeItemCheckboxState} of the tree item.
 		 * {@link TreeDataProvider.onDidChangeTreeData onDidChangeTreeData} should be fired when {@link TreeItem.checkboxState checkboxState} changes.
 		 */
-		checkboxState?: TreeItemCheckboxState | { readonly state: TreeItemCheckboxState; readonly tooltip?: string; readonly accessibilityInformation?: AccessibilityInformation };
+		checkboxState?: TreeItemCheckboxState | {
+			/**
+			 * The {@link TreeItemCheckboxState} of the tree item
+			 */
+			readonly state: TreeItemCheckboxState;
+			/**
+			 * A tooltip for the checkbox
+			 */
+			readonly tooltip?: string;
+			/**
+			 * Accessibility information used when screen readers interact with this checkbox
+			 */
+			readonly accessibilityInformation?: AccessibilityInformation;
+		};
 
 		/**
 		 * @param label A human-readable string describing this item
@@ -11028,7 +11676,16 @@ declare module 'vscode' {
 		/**
 		 * The icon path or {@link ThemeIcon} for the terminal.
 		 */
-		iconPath?: Uri | { light: Uri; dark: Uri } | ThemeIcon;
+		iconPath?: Uri | {
+			/**
+			 * The icon path for the light theme.
+			 */
+			light: Uri;
+			/**
+			 * The icon path for the dark theme.
+			 */
+			dark: Uri;
+		} | ThemeIcon;
 
 		/**
 		 * The icon {@link ThemeColor} for the terminal.
@@ -11067,7 +11724,16 @@ declare module 'vscode' {
 		/**
 		 * The icon path or {@link ThemeIcon} for the terminal.
 		 */
-		iconPath?: Uri | { light: Uri; dark: Uri } | ThemeIcon;
+		iconPath?: Uri | {
+			/**
+			 * The icon path for the light theme.
+			 */
+			light: Uri;
+			/**
+			 * The icon path for the dark theme.
+			 */
+			dark: Uri;
+		} | ThemeIcon;
 
 		/**
 		 * The icon {@link ThemeColor} for the terminal.
@@ -11475,7 +12141,7 @@ declare module 'vscode' {
 		 * returned. For instance, if the 'workspaceFolder' parameter is not specified, the collection that applies
 		 * across all workspace folders will be returned.
 		 *
-		 * @return Environment variable collection for the passed in scope.
+		 * @returns Environment variable collection for the passed in scope.
 		 */
 		getScoped(scope: EnvironmentVariableScope): EnvironmentVariableCollection;
 	}
@@ -11524,7 +12190,12 @@ declare module 'vscode' {
 		/**
 		 * The location at which progress should show.
 		 */
-		location: ProgressLocation | { viewId: string };
+		location: ProgressLocation | {
+			/**
+			 * The identifier of a view for which progress should be shown.
+			 */
+			viewId: string;
+		};
 
 		/**
 		 * A human-readable string which will be used to describe the
@@ -11701,7 +12372,7 @@ declare module 'vscode' {
 		 */
 		matchOnDetail: boolean;
 
-		/*
+		/**
 		 * An optional flag to maintain the scroll position of the quick pick when the quick pick items are updated. Defaults to false.
 		 */
 		keepScrollPosition?: boolean;
@@ -11803,7 +12474,16 @@ declare module 'vscode' {
 		/**
 		 * Icon for the button.
 		 */
-		readonly iconPath: Uri | { light: Uri; dark: Uri } | ThemeIcon;
+		readonly iconPath: Uri | {
+			/**
+			 * The icon path for the light theme.
+			 */
+			light: Uri;
+			/**
+			 * The icon path for the dark theme.
+			 */
+			dark: Uri;
+		} | ThemeIcon;
 
 		/**
 		 * An optional tooltip.
@@ -11867,6 +12547,9 @@ declare module 'vscode' {
 		readonly text: string;
 	}
 
+	/**
+	 * Reasons for why a text document has changed.
+	 */
 	export enum TextDocumentChangeReason {
 		/** The text change is caused by an undo operation. */
 		Undo = 1,
@@ -12107,7 +12790,16 @@ declare module 'vscode' {
 		/**
 		 * The files that are going to be renamed.
 		 */
-		readonly files: ReadonlyArray<{ readonly oldUri: Uri; readonly newUri: Uri }>;
+		readonly files: ReadonlyArray<{
+			/**
+			 * The old uri of a file.
+			 */
+			readonly oldUri: Uri;
+			/**
+			 * The new uri of a file.
+			 */
+			readonly newUri: Uri;
+		}>;
 
 		/**
 		 * Allows to pause the event and to apply a {@link WorkspaceEdit workspace edit}.
@@ -12147,7 +12839,16 @@ declare module 'vscode' {
 		/**
 		 * The files that got renamed.
 		 */
-		readonly files: ReadonlyArray<{ readonly oldUri: Uri; readonly newUri: Uri }>;
+		readonly files: ReadonlyArray<{
+			/**
+			 * The old uri of a file.
+			 */
+			readonly oldUri: Uri;
+			/**
+			 * The new uri of a file.
+			 */
+			readonly newUri: Uri;
+		}>;
 	}
 
 	/**
@@ -12296,7 +12997,7 @@ declare module 'vscode' {
 		 * * returns the *input* when the given uri is a workspace folder itself
 		 *
 		 * @param uri An uri.
-		 * @return A workspace folder or `undefined`
+		 * @returns A workspace folder or `undefined`
 		 */
 		export function getWorkspaceFolder(uri: Uri): WorkspaceFolder | undefined;
 
@@ -12310,7 +13011,7 @@ declare module 'vscode' {
 		 * @param includeWorkspaceFolder When `true` and when the given path is contained inside a
 		 * workspace folder the name of the workspace is prepended. Defaults to `true` when there are
 		 * multiple workspace folders and `false` otherwise.
-		 * @return A path relative to the root or the input.
+		 * @returns A path relative to the root or the input.
 		 */
 		export function asRelativePath(pathOrUri: string | Uri, includeWorkspaceFolder?: boolean): string;
 
@@ -12354,10 +13055,19 @@ declare module 'vscode' {
 		 * @param deleteCount the optional number of workspace folders to remove.
 		 * @param workspaceFoldersToAdd the optional variable set of workspace folders to add in place of the deleted ones.
 		 * Each workspace is identified with a mandatory URI and an optional name.
-		 * @return true if the operation was successfully started and false otherwise if arguments were used that would result
+		 * @returns true if the operation was successfully started and false otherwise if arguments were used that would result
 		 * in invalid workspace folder state (e.g. 2 folders with the same URI).
 		 */
-		export function updateWorkspaceFolders(start: number, deleteCount: number | undefined | null, ...workspaceFoldersToAdd: { readonly uri: Uri; readonly name?: string }[]): boolean;
+		export function updateWorkspaceFolders(start: number, deleteCount: number | undefined | null, ...workspaceFoldersToAdd: {
+			/**
+			 * The uri of a workspace folder that's to be added.
+			 */
+			readonly uri: Uri;
+			/**
+			 * The name of a workspace folder that's to be added.
+			 */
+			readonly name?: string;
+		}[]): boolean;
 
 		/**
 		 * Creates a file system watcher that is notified on file events (create, change, delete)
@@ -12478,7 +13188,7 @@ declare module 'vscode' {
 		 * @param ignoreCreateEvents Ignore when files have been created.
 		 * @param ignoreChangeEvents Ignore when files have been changed.
 		 * @param ignoreDeleteEvents Ignore when files have been deleted.
-		 * @return A new file system watcher instance. Must be disposed when no longer needed.
+		 * @returns A new file system watcher instance. Must be disposed when no longer needed.
 		 */
 		export function createFileSystemWatcher(globPattern: GlobPattern, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): FileSystemWatcher;
 
@@ -12496,7 +13206,7 @@ declare module 'vscode' {
 		 * but not `search.exclude`) will apply. When `null`, no excludes will apply.
 		 * @param maxResults An upper-bound for the result.
 		 * @param token A token that can be used to signal cancellation to the underlying search engine.
-		 * @return A thenable that resolves to an array of resource identifiers. Will return no results if no
+		 * @returns A thenable that resolves to an array of resource identifiers. Will return no results if no
 		 * {@link workspace.workspaceFolders workspace folders} are opened.
 		 */
 		export function findFiles(include: GlobPattern, exclude?: GlobPattern | null, maxResults?: number, token?: CancellationToken): Thenable<Uri[]>;
@@ -12505,7 +13215,7 @@ declare module 'vscode' {
 		 * Save all dirty files.
 		 *
 		 * @param includeUntitled Also save files that have been created during this session.
-		 * @return A thenable that resolves when the files have been saved. Will return `false`
+		 * @returns A thenable that resolves when the files have been saved. Will return `false`
 		 * for any file that failed to save.
 		 */
 		export function saveAll(includeUntitled?: boolean): Thenable<boolean>;
@@ -12525,7 +13235,7 @@ declare module 'vscode' {
 		 *
 		 * @param edit A workspace edit.
 		 * @param metadata Optional {@link WorkspaceEditMetadata metadata} for the edit.
-		 * @return A thenable that resolves when the edit could be applied.
+		 * @returns A thenable that resolves when the edit could be applied.
 		 */
 		export function applyEdit(edit: WorkspaceEdit, metadata?: WorkspaceEditMetadata): Thenable<boolean>;
 
@@ -12551,7 +13261,7 @@ declare module 'vscode' {
 		 * {@linkcode workspace.onDidCloseTextDocument onDidClose}-event can occur at any time after opening it.
 		 *
 		 * @param uri Identifies the resource to open.
-		 * @return A promise that resolves to a {@link TextDocument document}.
+		 * @returns A promise that resolves to a {@link TextDocument document}.
 		 */
 		export function openTextDocument(uri: Uri): Thenable<TextDocument>;
 
@@ -12560,7 +13270,7 @@ declare module 'vscode' {
 		 *
 		 * @see {@link workspace.openTextDocument}
 		 * @param fileName A name of a file on disk.
-		 * @return A promise that resolves to a {@link TextDocument document}.
+		 * @returns A promise that resolves to a {@link TextDocument document}.
 		 */
 		export function openTextDocument(fileName: string): Thenable<TextDocument>;
 
@@ -12570,9 +13280,18 @@ declare module 'vscode' {
 		 * specify the *language* and/or the *content* of the document.
 		 *
 		 * @param options Options to control how the document will be created.
-		 * @return A promise that resolves to a {@link TextDocument document}.
+		 * @returns A promise that resolves to a {@link TextDocument document}.
 		 */
-		export function openTextDocument(options?: { language?: string; content?: string }): Thenable<TextDocument>;
+		export function openTextDocument(options?: {
+			/**
+			 * The {@link TextDocument.languageId language} of the document.
+			 */
+			language?: string;
+			/**
+			 * The initial contents of the document.
+			 */
+			content?: string;
+		}): Thenable<TextDocument>;
 
 		/**
 		 * Register a text document content provider.
@@ -12581,7 +13300,7 @@ declare module 'vscode' {
 		 *
 		 * @param scheme The uri-scheme to register for.
 		 * @param provider A content provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerTextDocumentContentProvider(scheme: string, provider: TextDocumentContentProvider): Disposable;
 
@@ -12703,7 +13422,7 @@ declare module 'vscode' {
 		 * @param notebookType A notebook.
 		 * @param serializer A notebook serializer.
 		 * @param options Optional context options that define what parts of a notebook should be persisted
-		 * @return A {@link Disposable} that unregisters this serializer when being disposed.
+		 * @returns A {@link Disposable} that unregisters this serializer when being disposed.
 		 */
 		export function registerNotebookSerializer(notebookType: string, serializer: NotebookSerializer, options?: NotebookDocumentContentOptions): Disposable;
 
@@ -12803,7 +13522,7 @@ declare module 'vscode' {
 		 *
 		 * @param section A dot-separated identifier.
 		 * @param scope A scope for which the configuration is asked for.
-		 * @return The full configuration or a subset.
+		 * @returns The full configuration or a subset.
 		 */
 		export function getConfiguration(section?: string, scope?: ConfigurationScope | null): WorkspaceConfiguration;
 
@@ -12819,7 +13538,7 @@ declare module 'vscode' {
 		 *
 		 * @param type The task kind type this provider is registered for.
 		 * @param provider A task provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
 
@@ -12832,9 +13551,18 @@ declare module 'vscode' {
 		 * @param scheme The uri-{@link Uri.scheme scheme} the provider registers for.
 		 * @param provider The filesystem provider.
 		 * @param options Immutable metadata about the provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
-		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, options?: { readonly isCaseSensitive?: boolean; readonly isReadonly?: boolean }): Disposable;
+		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, options?: {
+			/**
+			 * Whether the file system provider use case sensitive compare for {@link Uri.path paths}
+			 */
+			readonly isCaseSensitive?: boolean;
+			/**
+			 * Whether the file system provider is readonly, no modifications like write, delete, create are possible.
+			 */
+			readonly isReadonly?: boolean;
+		}): Disposable;
 
 		/**
 		 * When true, the user has explicitly trusted the contents of the workspace.
@@ -12853,7 +13581,16 @@ declare module 'vscode' {
 	 * a '{@link TextDocument}' or
 	 * a '{@link WorkspaceFolder}'
 	 */
-	export type ConfigurationScope = Uri | TextDocument | WorkspaceFolder | { uri?: Uri; languageId: string };
+	export type ConfigurationScope = Uri | TextDocument | WorkspaceFolder | {
+		/**
+		 * The uri of a {@link TextDocument text document}
+		 */
+		uri?: Uri;
+		/**
+		 * The language of a text document
+		 */
+		languageId: string;
+	};
 
 	/**
 	 * An event describing the change in Configuration
@@ -12866,7 +13603,7 @@ declare module 'vscode' {
 		 *
 		 * @param section Configuration name, supports _dotted_ names.
 		 * @param scope A scope in which to check.
-		 * @return `true` if the given section has changed.
+		 * @returns `true` if the given section has changed.
 		 */
 		affectsConfiguration(section: string, scope?: ConfigurationScope): boolean;
 	}
@@ -12903,7 +13640,7 @@ declare module 'vscode' {
 
 		/**
 		 * Return the identifiers of all known languages.
-		 * @return Promise resolving to an array of identifier strings.
+		 * @returns Promise resolving to an array of identifier strings.
 		 */
 		export function getLanguages(): Thenable<string[]>;
 
@@ -12963,7 +13700,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A document selector.
 		 * @param document A text document.
-		 * @return A number `>0` when the selector matches and `0` when the selector does not match.
+		 * @returns A number `>0` when the selector matches and `0` when the selector does not match.
 		 */
 		export function match(selector: DocumentSelector, document: TextDocument): number;
 
@@ -12992,7 +13729,7 @@ declare module 'vscode' {
 		 * Create a diagnostics collection.
 		 *
 		 * @param name The {@link DiagnosticCollection.name name} of the collection.
-		 * @return A new diagnostic collection.
+		 * @returns A new diagnostic collection.
 		 */
 		export function createDiagnosticCollection(name?: string): DiagnosticCollection;
 
@@ -13001,6 +13738,7 @@ declare module 'vscode' {
 		 *
 		 * @param id The identifier of the item.
 		 * @param selector The document selector that defines for what editors the item shows.
+		 * @returns A new language status item.
 		 */
 		export function createLanguageStatusItem(id: string, selector: DocumentSelector): LanguageStatusItem;
 
@@ -13021,7 +13759,7 @@ declare module 'vscode' {
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A completion provider.
 		 * @param triggerCharacters Trigger completion when the user types one of the characters.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerCompletionItemProvider(selector: DocumentSelector, provider: CompletionItemProvider, ...triggerCharacters: string[]): Disposable;
 
@@ -13034,7 +13772,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider An inline completion provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerInlineCompletionItemProvider(selector: DocumentSelector, provider: InlineCompletionItemProvider): Disposable;
 
@@ -13048,7 +13786,7 @@ declare module 'vscode' {
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A code action provider.
 		 * @param metadata Metadata about the kind of code actions the provider provides.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerCodeActionsProvider(selector: DocumentSelector, provider: CodeActionProvider, metadata?: CodeActionProviderMetadata): Disposable;
 
@@ -13061,7 +13799,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A code lens provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerCodeLensProvider(selector: DocumentSelector, provider: CodeLensProvider): Disposable;
 
@@ -13074,7 +13812,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A definition provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDefinitionProvider(selector: DocumentSelector, provider: DefinitionProvider): Disposable;
 
@@ -13087,7 +13825,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider An implementation provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerImplementationProvider(selector: DocumentSelector, provider: ImplementationProvider): Disposable;
 
@@ -13100,7 +13838,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A type definition provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerTypeDefinitionProvider(selector: DocumentSelector, provider: TypeDefinitionProvider): Disposable;
 
@@ -13113,7 +13851,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A declaration provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDeclarationProvider(selector: DocumentSelector, provider: DeclarationProvider): Disposable;
 
@@ -13126,7 +13864,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A hover provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerHoverProvider(selector: DocumentSelector, provider: HoverProvider): Disposable;
 
@@ -13138,7 +13876,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider An evaluatable expression provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerEvaluatableExpressionProvider(selector: DocumentSelector, provider: EvaluatableExpressionProvider): Disposable;
 
@@ -13153,7 +13891,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider An inline values provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerInlineValuesProvider(selector: DocumentSelector, provider: InlineValuesProvider): Disposable;
 
@@ -13166,7 +13904,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A document highlight provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDocumentHighlightProvider(selector: DocumentSelector, provider: DocumentHighlightProvider): Disposable;
 
@@ -13180,7 +13918,7 @@ declare module 'vscode' {
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A document symbol provider.
 		 * @param metaData metadata about the provider
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDocumentSymbolProvider(selector: DocumentSelector, provider: DocumentSymbolProvider, metaData?: DocumentSymbolProviderMetadata): Disposable;
 
@@ -13192,7 +13930,7 @@ declare module 'vscode' {
 		 * a failure of the whole operation.
 		 *
 		 * @param provider A workspace symbol provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerWorkspaceSymbolProvider(provider: WorkspaceSymbolProvider): Disposable;
 
@@ -13205,7 +13943,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A reference provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerReferenceProvider(selector: DocumentSelector, provider: ReferenceProvider): Disposable;
 
@@ -13218,7 +13956,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A rename provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerRenameProvider(selector: DocumentSelector, provider: RenameProvider): Disposable;
 
@@ -13231,7 +13969,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A document semantic tokens provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDocumentSemanticTokensProvider(selector: DocumentSelector, provider: DocumentSemanticTokensProvider, legend: SemanticTokensLegend): Disposable;
 
@@ -13250,7 +13988,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A document range semantic tokens provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDocumentRangeSemanticTokensProvider(selector: DocumentSelector, provider: DocumentRangeSemanticTokensProvider, legend: SemanticTokensLegend): Disposable;
 
@@ -13263,7 +14001,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A document formatting edit provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDocumentFormattingEditProvider(selector: DocumentSelector, provider: DocumentFormattingEditProvider): Disposable;
 
@@ -13280,7 +14018,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A document range formatting edit provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDocumentRangeFormattingEditProvider(selector: DocumentSelector, provider: DocumentRangeFormattingEditProvider): Disposable;
 
@@ -13295,7 +14033,7 @@ declare module 'vscode' {
 		 * @param provider An on type formatting edit provider.
 		 * @param firstTriggerCharacter A character on which formatting should be triggered, like `}`.
 		 * @param moreTriggerCharacter More trigger characters.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerOnTypeFormattingEditProvider(selector: DocumentSelector, provider: OnTypeFormattingEditProvider, firstTriggerCharacter: string, ...moreTriggerCharacter: string[]): Disposable;
 
@@ -13309,10 +14047,18 @@ declare module 'vscode' {
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A signature help provider.
 		 * @param triggerCharacters Trigger signature help when the user types one of the characters, like `,` or `(`.
-		 * @param metadata Information about the provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerSignatureHelpProvider(selector: DocumentSelector, provider: SignatureHelpProvider, ...triggerCharacters: string[]): Disposable;
+
+		/**
+		 * @see {@link languages.registerSignatureHelpProvider}
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A signature help provider.
+		 * @param metadata Information about the provider.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
+		 */
 		export function registerSignatureHelpProvider(selector: DocumentSelector, provider: SignatureHelpProvider, metadata: SignatureHelpProviderMetadata): Disposable;
 
 		/**
@@ -13324,7 +14070,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A document link provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDocumentLinkProvider(selector: DocumentSelector, provider: DocumentLinkProvider): Disposable;
 
@@ -13337,7 +14083,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A color provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerColorProvider(selector: DocumentSelector, provider: DocumentColorProvider): Disposable;
 
@@ -13350,7 +14096,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider An inlay hints provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerInlayHintsProvider(selector: DocumentSelector, provider: InlayHintsProvider): Disposable;
 
@@ -13367,7 +14113,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A folding range provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerFoldingRangeProvider(selector: DocumentSelector, provider: FoldingRangeProvider): Disposable;
 
@@ -13380,7 +14126,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A selection range provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerSelectionRangeProvider(selector: DocumentSelector, provider: SelectionRangeProvider): Disposable;
 
@@ -13389,7 +14135,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A call hierarchy provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerCallHierarchyProvider(selector: DocumentSelector, provider: CallHierarchyProvider): Disposable;
 
@@ -13398,7 +14144,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A type hierarchy provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerTypeHierarchyProvider(selector: DocumentSelector, provider: TypeHierarchyProvider): Disposable;
 
@@ -13411,7 +14157,7 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A linked editing range provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerLinkedEditingRangeProvider(selector: DocumentSelector, provider: LinkedEditingRangeProvider): Disposable;
 
@@ -13421,7 +14167,7 @@ declare module 'vscode' {
 		 * @param selector A selector that defines the documents this provider applies to.
 		 * @param provider A drop provider.
 		 *
-		 * @return A {@link Disposable} that unregisters this provider when disposed of.
+		 * @returns A {@link Disposable} that unregisters this provider when disposed of.
 		 */
 		export function registerDocumentDropEditProvider(selector: DocumentSelector, provider: DocumentDropEditProvider): Disposable;
 
@@ -13430,7 +14176,7 @@ declare module 'vscode' {
 		 *
 		 * @param language A language identifier like `typescript`.
 		 * @param configuration Language configuration.
-		 * @return A {@link Disposable} that unsets this configuration.
+		 * @returns A {@link Disposable} that unsets this configuration.
 		 */
 		export function setLanguageConfiguration(language: string, configuration: LanguageConfiguration): Disposable;
 	}
@@ -13512,7 +14258,13 @@ declare module 'vscode' {
 		 * An event that fires when a message is received from a renderer.
 		 */
 		readonly onDidReceiveMessage: Event<{
+			/**
+			 * The {@link NotebookEditor editor} that sent the message.
+			 */
 			readonly editor: NotebookEditor;
+			/**
+			 * The actual message.
+			 */
 			readonly message: any;
 		}>;
 
@@ -13648,7 +14400,7 @@ declare module 'vscode' {
 		 * Return the cell at the specified index. The index will be adjusted to the notebook.
 		 *
 		 * @param index - The index of the cell to retrieve.
-		 * @return A {@link NotebookCell cell}.
+		 * @returns A {@link NotebookCell cell}.
 		 */
 		cellAt(index: number): NotebookCell;
 
@@ -13664,7 +14416,7 @@ declare module 'vscode' {
 		/**
 		 * Save the document. The saving will be handled by the corresponding {@link NotebookSerializer serializer}.
 		 *
-		 * @return A promise that will resolve to true when the document
+		 * @returns A promise that will resolve to true when the document
 		 * has been saved. Will return false if the file was not dirty or when save failed.
 		 */
 		save(): Thenable<boolean>;
@@ -13831,7 +14583,16 @@ declare module 'vscode' {
 		/**
 		 * The times at which execution started and ended, as unix timestamps
 		 */
-		readonly timing?: { readonly startTime: number; readonly endTime: number };
+		readonly timing?: {
+			/**
+			 * Execution start time.
+			 */
+			readonly startTime: number;
+			/**
+			 * Execution end time.
+			 */
+			readonly endTime: number;
+		};
 	}
 
 	/**
@@ -13868,10 +14629,19 @@ declare module 'vscode' {
 		 * Derive a new range for this range.
 		 *
 		 * @param change An object that describes a change to this range.
-		 * @return A range that reflects the given change. Will return `this` range if the change
+		 * @returns A range that reflects the given change. Will return `this` range if the change
 		 * is not changing anything.
 		 */
-		with(change: { start?: number; end?: number }): NotebookRange;
+		with(change: {
+			/**
+			 * New start index, defaults to `this.start`.
+			 */
+			start?: number;
+			/**
+			 * New end index, defaults to `this.end`.
+			 */
+			end?: number;
+		}): NotebookRange;
 	}
 
 	/**
@@ -14079,7 +14849,7 @@ declare module 'vscode' {
 		 *
 		 * @param content Contents of a notebook file.
 		 * @param token A cancellation token.
-		 * @return Notebook data or a thenable that resolves to such.
+		 * @returns Notebook data or a thenable that resolves to such.
 		 */
 		deserializeNotebook(content: Uint8Array, token: CancellationToken): NotebookData | Thenable<NotebookData>;
 
@@ -14251,7 +15021,16 @@ declare module 'vscode' {
 		 * _Note_ that controller selection is persisted (by the controllers {@link NotebookController.id id}) and restored as soon as a
 		 * controller is re-created or as a notebook is {@link workspace.onDidOpenNotebookDocument opened}.
 		 */
-		readonly onDidChangeSelectedNotebooks: Event<{ readonly notebook: NotebookDocument; readonly selected: boolean }>;
+		readonly onDidChangeSelectedNotebooks: Event<{
+			/**
+			 * The notebook for which the controller has been selected or un-selected.
+			 */
+			readonly notebook: NotebookDocument;
+			/**
+			 * Whether the controller has been selected or un-selected.
+			 */
+			readonly selected: boolean;
+		}>;
 
 		/**
 		 * A controller can set affinities for specific notebook documents. This allows a controller
@@ -14320,7 +15099,7 @@ declare module 'vscode' {
 		 *
 		 * @param cell Cell for which output is cleared. Defaults to the {@link NotebookCellExecution.cell cell} of
 		 * this execution.
-		 * @return A thenable that resolves when the operation finished.
+		 * @returns A thenable that resolves when the operation finished.
 		 */
 		clearOutput(cell?: NotebookCell): Thenable<void>;
 
@@ -14330,7 +15109,7 @@ declare module 'vscode' {
 		 * @param out Output that replaces the current output.
 		 * @param cell Cell for which output is cleared. Defaults to the {@link NotebookCellExecution.cell cell} of
 		 * this execution.
-		 * @return A thenable that resolves when the operation finished.
+		 * @returns A thenable that resolves when the operation finished.
 		 */
 		replaceOutput(out: NotebookCellOutput | readonly NotebookCellOutput[], cell?: NotebookCell): Thenable<void>;
 
@@ -14340,7 +15119,7 @@ declare module 'vscode' {
 		 * @param out Output that is appended to the current output.
 		 * @param cell Cell for which output is cleared. Defaults to the {@link NotebookCellExecution.cell cell} of
 		 * this execution.
-		 * @return A thenable that resolves when the operation finished.
+		 * @returns A thenable that resolves when the operation finished.
 		 */
 		appendOutput(out: NotebookCellOutput | readonly NotebookCellOutput[], cell?: NotebookCell): Thenable<void>;
 
@@ -14349,7 +15128,7 @@ declare module 'vscode' {
 		 *
 		 * @param items Output items that replace the items of existing output.
 		 * @param output Output object that already exists.
-		 * @return A thenable that resolves when the operation finished.
+		 * @returns A thenable that resolves when the operation finished.
 		 */
 		replaceOutputItems(items: NotebookCellOutputItem | readonly NotebookCellOutputItem[], output: NotebookCellOutput): Thenable<void>;
 
@@ -14358,7 +15137,7 @@ declare module 'vscode' {
 		 *
 		 * @param items Output items that are append to existing output.
 		 * @param output Output object that already exists.
-		 * @return A thenable that resolves when the operation finished.
+		 * @returns A thenable that resolves when the operation finished.
 		 */
 		appendOutputItems(items: NotebookCellOutputItem | readonly NotebookCellOutputItem[], output: NotebookCellOutput): Thenable<void>;
 	}
@@ -14439,7 +15218,7 @@ declare module 'vscode' {
 		 * The provider will be called when the cell scrolls into view, when its content, outputs, language, or metadata change, and when it changes execution state.
 		 * @param cell The cell for which to return items.
 		 * @param token A token triggered if this request should be cancelled.
-		 * @return One or more {@link NotebookCellStatusBarItem cell statusbar items}
+		 * @returns One or more {@link NotebookCellStatusBarItem cell statusbar items}
 		 */
 		provideCellStatusBarItems(cell: NotebookCell, token: CancellationToken): ProviderResult<NotebookCellStatusBarItem | NotebookCellStatusBarItem[]>;
 	}
@@ -14462,6 +15241,7 @@ declare module 'vscode' {
 		 * @param notebookType A notebook type for which this controller is for.
 		 * @param label The label of the controller.
 		 * @param handler The execute-handler of the controller.
+		 * @returns A new notebook controller.
 		 */
 		export function createNotebookController(id: string, notebookType: string, label: string, handler?: (cells: NotebookCell[], notebook: NotebookDocument, controller: NotebookController) => void | Thenable<void>): NotebookController;
 
@@ -14470,7 +15250,7 @@ declare module 'vscode' {
 		 *
 		 * @param notebookType The notebook type to register for.
 		 * @param provider A cell status bar provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerNotebookCellStatusBarItemProvider(notebookType: string, provider: NotebookCellStatusBarItemProvider): Disposable;
 
@@ -14513,14 +15293,19 @@ declare module 'vscode' {
 		visible: boolean;
 	}
 
-	interface QuickDiffProvider {
+	/**
+	 * A quick diff provider provides a {@link Uri uri} to the original state of a
+	 * modified resource. The editor will use this information to render ad'hoc diffs
+	 * within the text.
+	 */
+	export interface QuickDiffProvider {
 
 		/**
 		 * Provide a {@link Uri} to the original resource of any given resource uri.
 		 *
 		 * @param uri The uri of the resource open in a text editor.
 		 * @param token A cancellation token.
-		 * @return A thenable that resolves to uri of the matching original resource.
+		 * @returns A thenable that resolves to uri of the matching original resource.
 		 */
 		provideOriginalResource?(uri: Uri, token: CancellationToken): ProviderResult<Uri>;
 	}
@@ -14726,6 +15511,9 @@ declare module 'vscode' {
 		dispose(): void;
 	}
 
+	/**
+	 * Namespace for source control mangement.
+	 */
 	export namespace scm {
 
 		/**
@@ -14742,7 +15530,7 @@ declare module 'vscode' {
 		 * @param id An `id` for the source control. Something short, e.g.: `git`.
 		 * @param label A human-readable string for the source control. E.g.: `Git`.
 		 * @param rootUri An optional Uri of the root of the source control. E.g.: `Uri.parse(workspaceRoot)`.
-		 * @return An instance of {@link SourceControl source control}.
+		 * @returns An instance of {@link SourceControl source control}.
 		 */
 		export function createSourceControl(id: string, label: string, rootUri?: Uri): SourceControl;
 	}
@@ -14843,7 +15631,7 @@ declare module 'vscode' {
 		 * If no DAP breakpoint exists (either because the editor breakpoint was not yet registered or because the debug adapter is not interested in the breakpoint), the value `undefined` is returned.
 		 *
 		 * @param breakpoint A {@link Breakpoint} in the editor.
-		 * @return A promise that resolves to the Debug Adapter Protocol breakpoint or `undefined`.
+		 * @returns A promise that resolves to the Debug Adapter Protocol breakpoint or `undefined`.
 		 */
 		getDebugProtocolBreakpoint(breakpoint: Breakpoint): Thenable<DebugProtocolBreakpoint | undefined>;
 	}
@@ -14880,7 +15668,7 @@ declare module 'vscode' {
 		 *
 		 * @param folder The workspace folder for which the configurations are used or `undefined` for a folderless setup.
 		 * @param token A cancellation token.
-		 * @return An array of {@link DebugConfiguration debug configurations}.
+		 * @returns An array of {@link DebugConfiguration debug configurations}.
 		 */
 		provideDebugConfigurations?(folder: WorkspaceFolder | undefined, token?: CancellationToken): ProviderResult<DebugConfiguration[]>;
 
@@ -14894,7 +15682,7 @@ declare module 'vscode' {
 		 * @param folder The workspace folder from which the configuration originates from or `undefined` for a folderless setup.
 		 * @param debugConfiguration The {@link DebugConfiguration debug configuration} to resolve.
 		 * @param token A cancellation token.
-		 * @return The resolved debug configuration or undefined or null.
+		 * @returns The resolved debug configuration or undefined or null.
 		 */
 		resolveDebugConfiguration?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration>;
 
@@ -14909,7 +15697,7 @@ declare module 'vscode' {
 		 * @param folder The workspace folder from which the configuration originates from or `undefined` for a folderless setup.
 		 * @param debugConfiguration The {@link DebugConfiguration debug configuration} to resolve.
 		 * @param token A cancellation token.
-		 * @return The resolved debug configuration or undefined or null.
+		 * @returns The resolved debug configuration or undefined or null.
 		 */
 		resolveDebugConfigurationWithSubstitutedVariables?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration>;
 	}
@@ -15032,8 +15820,14 @@ declare module 'vscode' {
 		constructor(implementation: DebugAdapter);
 	}
 
+	/**
+	 * Represents the different types of debug adapters
+	 */
 	export type DebugAdapterDescriptor = DebugAdapterExecutable | DebugAdapterServer | DebugAdapterNamedPipeServer | DebugAdapterInlineImplementation;
 
+	/**
+	 * A debug adaper factory that creates {@link DebugAdapterDescriptor debug adapter descriptors}.
+	 */
 	export interface DebugAdapterDescriptorFactory {
 		/**
 		 * 'createDebugAdapterDescriptor' is called at the start of a debug session to provide details about the debug adapter to use.
@@ -15050,7 +15844,7 @@ declare module 'vscode' {
 		 *   }
 		 * @param session The {@link DebugSession debug session} for which the debug adapter will be used.
 		 * @param executable The debug adapter's executable information as specified in the package.json (or undefined if no such information exists).
-		 * @return a {@link DebugAdapterDescriptor debug adapter descriptor} or undefined.
+		 * @returns a {@link DebugAdapterDescriptor debug adapter descriptor} or undefined.
 		 */
 		createDebugAdapterDescriptor(session: DebugSession, executable: DebugAdapterExecutable | undefined): ProviderResult<DebugAdapterDescriptor>;
 	}
@@ -15085,13 +15879,16 @@ declare module 'vscode' {
 		onExit?(code: number | undefined, signal: string | undefined): void;
 	}
 
+	/**
+	 * A debug adaper factory that creates {@link DebugAdapterTracker debug adapter trackers}.
+	 */
 	export interface DebugAdapterTrackerFactory {
 		/**
 		 * The method 'createDebugAdapterTracker' is called at the start of a debug session in order
 		 * to return a "tracker" object that provides read-access to the communication between the editor and a debug adapter.
 		 *
 		 * @param session The {@link DebugSession debug session} for which the debug adapter tracker will be used.
-		 * @return A {@link DebugAdapterTracker debug adapter tracker} or undefined.
+		 * @returns A {@link DebugAdapterTracker debug adapter tracker} or undefined.
 		 */
 		createDebugAdapterTracker(session: DebugSession): ProviderResult<DebugAdapterTracker>;
 	}
@@ -15161,6 +15958,14 @@ declare module 'vscode' {
 		 */
 		readonly logMessage?: string | undefined;
 
+		/**
+		 * Creates a new breakpoint
+		 *
+		 * @param enabled Is breakpoint enabled.
+		 * @param condition Expression for conditional breakpoints
+		 * @param hitCondition Expression that controls how many hits of the breakpoint are ignored
+		 * @param logMessage Log message to display when breakpoint is hit
+		 */
 		protected constructor(enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
 	}
 
@@ -15348,7 +16153,7 @@ declare module 'vscode' {
 		 * @param debugType The debug type for which the provider is registered.
 		 * @param provider The {@link DebugConfigurationProvider debug configuration provider} to register.
 		 * @param triggerKind The {@link DebugConfigurationProviderTriggerKind trigger} for which the 'provideDebugConfiguration' method of the provider is registered. If `triggerKind` is missing, the value `DebugConfigurationProviderTriggerKind.Initial` is assumed.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerDebugConfigurationProvider(debugType: string, provider: DebugConfigurationProvider, triggerKind?: DebugConfigurationProviderTriggerKind): Disposable;
 
@@ -15359,7 +16164,7 @@ declare module 'vscode' {
 		 *
 		 * @param debugType The debug type for which the factory is registered.
 		 * @param factory The {@link DebugAdapterDescriptorFactory debug adapter descriptor factory} to register.
-		 * @return A {@link Disposable} that unregisters this factory when being disposed.
+		 * @returns A {@link Disposable} that unregisters this factory when being disposed.
 		 */
 		export function registerDebugAdapterDescriptorFactory(debugType: string, factory: DebugAdapterDescriptorFactory): Disposable;
 
@@ -15368,7 +16173,7 @@ declare module 'vscode' {
 		 *
 		 * @param debugType The debug type for which the factory is registered or '*' for matching all debug types.
 		 * @param factory The {@link DebugAdapterTrackerFactory debug adapter tracker factory} to register.
-		 * @return A {@link Disposable} that unregisters this factory when being disposed.
+		 * @returns A {@link Disposable} that unregisters this factory when being disposed.
 		 */
 		export function registerDebugAdapterTrackerFactory(debugType: string, factory: DebugAdapterTrackerFactory): Disposable;
 
@@ -15381,13 +16186,15 @@ declare module 'vscode' {
 		 * @param folder The {@link WorkspaceFolder workspace folder} for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
 		 * @param nameOrConfiguration Either the name of a debug or compound configuration or a {@link DebugConfiguration} object.
 		 * @param parentSessionOrOptions Debug session options. When passed a parent {@link DebugSession debug session}, assumes options with just this parent session.
-		 * @return A thenable that resolves when debugging could be successfully started.
+		 * @returns A thenable that resolves when debugging could be successfully started.
 		 */
 		export function startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration, parentSessionOrOptions?: DebugSession | DebugSessionOptions): Thenable<boolean>;
 
 		/**
 		 * Stop the given debug session or stop all debug sessions if session is omitted.
+		 *
 		 * @param session The {@link DebugSession debug session} to stop; if omitted all sessions are stopped.
+		 * @returns A thenable that resolves when the session(s) have been stopped.
 		 */
 		export function stopDebugging(session?: DebugSession): Thenable<void>;
 
@@ -15412,7 +16219,7 @@ declare module 'vscode' {
 		 *
 		 * @param source An object conforming to the [Source](https://microsoft.github.io/debug-adapter-protocol/specification#Types_Source) type defined in the Debug Adapter Protocol.
 		 * @param session An optional debug session that will be used when the source descriptor uses a reference number to load the contents from an active debug session.
-		 * @return A uri that can be used to load the contents of the source.
+		 * @returns A uri that can be used to load the contents of the source.
 		 */
 		export function asDebugSourceUri(source: DebugProtocolSource, session?: DebugSession): Uri;
 	}
@@ -15455,7 +16262,7 @@ declare module 'vscode' {
 		 * Get an extension by its full identifier in the form of: `publisher.name`.
 		 *
 		 * @param extensionId An extension identifier.
-		 * @return An extension or `undefined`.
+		 * @returns An extension or `undefined`.
 		 */
 		export function getExtension<T = any>(extensionId: string): Extension<T> | undefined;
 
@@ -15505,7 +16312,13 @@ declare module 'vscode' {
 	 * The state of a comment thread.
 	 */
 	export enum CommentThreadState {
+		/**
+		 * Unresolved thread state
+		 */
 		Unresolved = 0,
+		/**
+		 * Resolved thread state
+		 */
 		Resolved = 1
 	}
 
@@ -15773,7 +16586,7 @@ declare module 'vscode' {
 		 *
 		 * @param id An `id` for the comment controller.
 		 * @param label A human-readable string for the comment controller.
-		 * @return An instance of {@link CommentController comment controller}.
+		 * @returns An instance of {@link CommentController comment controller}.
 		 */
 		export function createCommentController(id: string, label: string): CommentController;
 	}
@@ -16014,7 +16827,7 @@ declare module 'vscode' {
 		 * @param options The {@link AuthenticationGetSessionOptions} to use
 		 * @returns A thenable that resolves to an authentication session
 		 */
-		export function getSession(providerId: string, scopes: readonly string[], options: AuthenticationGetSessionOptions & { createIfNone: true }): Thenable<AuthenticationSession>;
+		export function getSession(providerId: string, scopes: readonly string[], options: AuthenticationGetSessionOptions & { /** */createIfNone: true }): Thenable<AuthenticationSession>;
 
 		/**
 		 * Get an authentication session matching the desired scopes. Rejects if a provider with providerId is not
@@ -16029,7 +16842,7 @@ declare module 'vscode' {
 		 * @param options The {@link AuthenticationGetSessionOptions} to use
 		 * @returns A thenable that resolves to an authentication session
 		 */
-		export function getSession(providerId: string, scopes: readonly string[], options: AuthenticationGetSessionOptions & { forceNewSession: true | AuthenticationForceNewSessionOptions }): Thenable<AuthenticationSession>;
+		export function getSession(providerId: string, scopes: readonly string[], options: AuthenticationGetSessionOptions & { /** literal-type defines return type */forceNewSession: true | AuthenticationForceNewSessionOptions }): Thenable<AuthenticationSession>;
 
 		/**
 		 * Get an authentication session matching the desired scopes. Rejects if a provider with providerId is not
@@ -16062,7 +16875,7 @@ declare module 'vscode' {
 		 * @param label The human-readable name of the provider.
 		 * @param provider The authentication provider provider.
 		 * @param options Additional options for the provider.
-		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * @returns A {@link Disposable} that unregisters this provider when being disposed.
 		 */
 		export function registerAuthenticationProvider(id: string, label: string, provider: AuthenticationProvider, options?: AuthenticationProviderOptions): Disposable;
 	}
@@ -16171,8 +16984,17 @@ declare module 'vscode' {
 	 * The kind of executions that {@link TestRunProfile TestRunProfiles} control.
 	 */
 	export enum TestRunProfileKind {
+		/**
+		 * The `Run` test profile kind.
+		 */
 		Run = 1,
+		/**
+		 * The `Debug` test profile kind.
+		 */
 		Debug = 2,
+		/**
+		 * The `Coverage` test profile kind.
+		 */
 		Coverage = 3,
 	}
 
@@ -17020,8 +17842,17 @@ declare module 'vscode' {
 	 * This is to be used when you can guarantee no identifiable information is contained in the value and the cleaning is improperly redacting it.
 	 */
 	export class TelemetryTrustedValue<T = any> {
+
+		/**
+		 * The value that is trusted to not contain PII.
+		 */
 		readonly value: T;
 
+		/**
+		 * Creates a new telementry trusted value.
+		 *
+		 * @param value A value to trust
+		 */
 		constructor(value: T);
 	}
 
@@ -17168,5 +17999,11 @@ interface Thenable<T> {
 	* @returns A Promise for the completion of which ever callback is executed.
 	*/
 	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>;
+	/**
+	* Attaches callbacks for the resolution and/or rejection of the Promise.
+	* @param onfulfilled The callback to execute when the Promise is resolved.
+	* @param onrejected The callback to execute when the Promise is rejected.
+	* @returns A Promise for the completion of which ever callback is executed.
+	*/
 	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => void): Thenable<TResult>;
 }

From e1430e432895252e7cba410898e89d0337c564d1 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 1 Sep 2023 13:41:45 +0200
Subject: [PATCH 27/94] Sets up hot reloading of css and code (requires
 vscode-diagnostic-tools extension to be installed)

---
 .vscode/launch.json                           |   6 +-
 scripts/debugger-scripts-api.d.ts             |  22 ++
 scripts/hot-reload-injected-script.js         | 267 ++++++++++++++++++
 src/vs/base/common/hotReload.ts               |  59 ++++
 .../browser/widget/diffEditorWidget2/utils.ts |  36 +--
 5 files changed, 368 insertions(+), 22 deletions(-)
 create mode 100644 scripts/debugger-scripts-api.d.ts
 create mode 100644 scripts/hot-reload-injected-script.js
 create mode 100644 src/vs/base/common/hotReload.ts

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 3bea8e7c076..b2e25927a8a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -256,7 +256,11 @@
 			"browserLaunchLocation": "workspace",
 			"presentation": {
 				"hidden": true,
-			}
+			},
+			// This is read by the vscode-diagnostic-tools extension
+			"vscode-diagnostic-tools.debuggerScripts": [
+				"${workspaceFolder}/scripts/hot-reload-injected-script.js"
+			]
 		},
 		{
 			"type": "node",
diff --git a/scripts/debugger-scripts-api.d.ts b/scripts/debugger-scripts-api.d.ts
new file mode 100644
index 00000000000..149912bc04f
--- /dev/null
+++ b/scripts/debugger-scripts-api.d.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+type RunFunction = ((debugSession: IDebugSession) => IDisposable) | ((debugSession: IDebugSession) => Promise<IDisposable>);
+
+interface IDebugSession {
+	name: string;
+	eval(expression: string): Promise<void>;
+	evalJs<T extends any[]>(bodyFn: (...args: T) => void, ...args: T): Promise<void>;
+}
+
+interface IDisposable {
+	dispose(): void;
+}
+
+interface GlobalThisAddition extends globalThis {
+	$hotReload_applyNewExports?(oldExports: Record<string, unknown>): AcceptNewExportsFn | undefined;
+}
+
+type AcceptNewExportsFn = (newExports: Record<string, unknown>) => boolean;
diff --git a/scripts/hot-reload-injected-script.js b/scripts/hot-reload-injected-script.js
new file mode 100644
index 00000000000..c6311f3b9c9
--- /dev/null
+++ b/scripts/hot-reload-injected-script.js
@@ -0,0 +1,267 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// @ts-check
+/// <reference path='debugger-scripts-api.d.ts' />
+
+const path = require('path');
+const fsPromise = require('fs/promises');
+const parcelWatcher = require('@parcel/watcher');
+
+// This file is loaded by the vscode-diagnostic-tools extension and injected into the debugger.
+
+/** @type {RunFunction} */
+module.exports.run = async function (debugSession) {
+	const watcher = await DirWatcher.watchRecursively(path.join(__dirname, '../out/'));
+
+	const sub = watcher.onDidChange(changes => {
+		const supportedChanges = changes.filter(c => c.path.endsWith('.js') || c.path.endsWith('.css'));
+		debugSession.evalJs(function (changes, debugSessionName) {
+			// This function is stringified and injected into the debuggee.
+
+			/** @type {{ count: number; originalWindowTitle: any; timeout: any; shouldReload: boolean }} */
+			const hotReloadData = globalThis.$hotReloadData || (globalThis.$hotReloadData = { count: 0, messageHideTimeout: undefined, shouldReload: false });
+
+			/**
+			 * @param {string} path
+			 * @param {string} newSrc
+			 */
+			function handleChange(path, newSrc) {
+				const relativePath = path.replace(/\\/g, '/').split('/out/')[1];
+				if (relativePath.endsWith('.css')) {
+					handleCssChange(relativePath);
+				} else if (relativePath.endsWith('.js')) {
+					handleJsChange(relativePath, newSrc);
+				}
+			}
+
+			/**
+			 * @param {string} relativePath
+			 */
+			function handleCssChange(relativePath) {
+				if (typeof document === 'undefined') {
+					return;
+				}
+
+				const styleSheet = (/** @type {HTMLLinkElement[]} */ ([...document.querySelectorAll(`link[rel='stylesheet']`)]))
+					.find(l => new URL(l.href, document.location.href).pathname.endsWith(relativePath));
+				if (styleSheet) {
+					setMessage(`reload ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+					console.log(debugSessionName, 'css reloaded', relativePath);
+					styleSheet.href = styleSheet.href.replace(/\?.*/, '') + '?' + Date.now();
+				} else {
+					setMessage(`could not reload ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+					console.log(debugSessionName, 'ignoring css change, as stylesheet is not loaded', relativePath);
+				}
+			}
+
+			/**
+			 * @param {string} relativePath
+			 * @param {string} newSrc
+			 */
+			function handleJsChange(relativePath, newSrc) {
+				const moduleIdStr = trimEnd(relativePath, '.js');
+
+				/** @type {any} */
+				const requireFn = globalThis.require;
+				const moduleManager = requireFn.moduleManager;
+				if (!moduleManager) {
+					console.log(debugSessionName, 'ignoring js change, as moduleManager is not available', relativePath);
+					return;
+				}
+
+				const moduleId = moduleManager._moduleIdProvider.getModuleId(moduleIdStr);
+				const oldModule = moduleManager._modules2[moduleId];
+
+				if (!oldModule) {
+					console.log(debugSessionName, 'ignoring js change, as module is not loaded', relativePath);
+					return;
+				}
+
+				// Check if we can reload
+				const g = /** @type {GlobalThisAddition} */ (globalThis);
+
+				// A frozen copy of the previous exports
+				const oldExports = Object.freeze({ ...oldModule.exports });
+				const reloadFn = g.$hotReload_applyNewExports?.(oldExports);
+
+				if (!reloadFn) {
+					console.log(debugSessionName, 'ignoring js change, as module does not support hot-reload', relativePath);
+					hotReloadData.shouldReload = true;
+					setMessage(`hot reload not supported for ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+					return;
+				}
+
+				const newScript = new Function('define', newSrc); // CodeQL [SM01632] This code is only executed during development. It is required for the hot-reload functionality.
+
+				newScript(/* define */ function (deps, callback) {
+					// Evaluating the new code was successful.
+
+					// Redefine the module
+					delete moduleManager._modules2[moduleId];
+					moduleManager.defineModule(moduleIdStr, deps, callback);
+					const newModule = moduleManager._modules2[moduleId];
+
+
+					// Patch the exports of the old module, so that modules using the old module get the new exports
+					Object.assign(oldModule.exports, newModule.exports);
+					// We override the exports so that future reloads still patch the initial exports.
+					newModule.exports = oldModule.exports;
+
+					const successful = reloadFn(newModule.exports);
+					if (!successful) {
+						hotReloadData.shouldReload = true;
+						setMessage(`hot reload failed ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+						console.log(debugSessionName, 'hot reload was not successful', relativePath);
+						return;
+					}
+
+					console.log(debugSessionName, 'hot reloaded', moduleIdStr);
+					setMessage(`successfully reloaded ${formatPath(relativePath)} - ${new Date().toLocaleTimeString()}`);
+				});
+			}
+
+			/**
+			 * @param {string} message
+			 */
+			function setMessage(message) {
+				const domElem = /** @type {HTMLDivElement | undefined} */ (document.querySelector('.titlebar-center .window-title'));
+				if (!domElem) { return; }
+				if (!hotReloadData.timeout) {
+					hotReloadData.originalWindowTitle = domElem.innerText;
+				} else {
+					clearTimeout(hotReloadData.timeout);
+				}
+				if (hotReloadData.shouldReload) {
+					message += ' (manual reload required)';
+				}
+
+				domElem.innerText = message;
+				hotReloadData.timeout = setTimeout(() => {
+					hotReloadData.timeout = undefined;
+					// If wanted, we can restore the previous title message
+					// domElem.replaceChildren(hotReloadData.originalWindowTitle);
+				}, 5000);
+			}
+
+			/**
+			 * @param {string} path
+			 * @returns {string}
+			 */
+			function formatPath(path) {
+				const parts = path.split('/');
+				parts.reverse();
+				let result = parts[0];
+				parts.shift();
+				for (const p of parts) {
+					if (result.length + p.length > 40) {
+						break;
+					}
+					result = p + '/' + result;
+					if (result.length > 20) {
+						break;
+					}
+				}
+				return result;
+			}
+
+			function trimEnd(str, suffix) {
+				if (str.endsWith(suffix)) {
+					return str.substring(0, str.length - suffix.length);
+				}
+				return str;
+			}
+
+			for (const change of changes) {
+				handleChange(change.path, change.newContent);
+			}
+
+		}, supportedChanges, debugSession.name.substring(0, 25));
+	});
+
+	return {
+		dispose() {
+			sub.dispose();
+			watcher.dispose();
+		}
+	};
+};
+
+class DirWatcher {
+	/**
+	 *
+	 * @param {string} dir
+	 * @returns {Promise<DirWatcher>}
+	 */
+	static async watchRecursively(dir) {
+		/** @type {((changes: { path: string, newContent: string }[]) => void)[]} */
+		const listeners = [];
+		/** @type {Map<string, string> } */
+		const fileContents = new Map();
+		/** @type {Map<string, { path: string, newContent: string }>} */
+		const changes = new Map();
+		/** @type {(handler: (changes: { path: string, newContent: string }[]) => void) => IDisposable} */
+		const event = (handler) => {
+			listeners.push(handler);
+			return {
+				dispose: () => {
+					const idx = listeners.indexOf(handler);
+					if (idx >= 0) {
+						listeners.splice(idx, 1);
+					}
+				}
+			};
+		};
+		const r = parcelWatcher.subscribe(dir, async (err, events) => {
+			for (const e of events) {
+				if (e.type === 'update') {
+					const newContent = await fsPromise.readFile(e.path, 'utf8');
+					if (fileContents.get(e.path) !== newContent) {
+						fileContents.set(e.path, newContent);
+						changes.set(e.path, { path: e.path, newContent });
+					}
+				}
+			}
+			if (changes.size > 0) {
+				debounce(() => {
+					const uniqueChanges = Array.from(changes.values());
+					changes.clear();
+					listeners.forEach(l => l(uniqueChanges));
+				})();
+			}
+		});
+		const result = await r;
+		return new DirWatcher(event, () => result.unsubscribe());
+	}
+
+	/**
+	 * @param {(handler: (changes: { path: string, newContent: string }[]) => void) => IDisposable} onDidChange
+	 * @param {() => void} unsub
+	 */
+	constructor(onDidChange, unsub) {
+		this.onDidChange = onDidChange;
+		this.unsub = unsub;
+	}
+
+	dispose() {
+		this.unsub();
+	}
+}
+
+/**
+ * Debounce function calls
+ * @param {() => void} fn
+ * @param {number} delay
+ */
+function debounce(fn, delay = 50) {
+	let timeoutId;
+	return function (...args) {
+		clearTimeout(timeoutId);
+		timeoutId = setTimeout(() => {
+			fn.apply(this, args);
+		}, delay);
+	};
+}
+
diff --git a/src/vs/base/common/hotReload.ts b/src/vs/base/common/hotReload.ts
new file mode 100644
index 00000000000..17724907937
--- /dev/null
+++ b/src/vs/base/common/hotReload.ts
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { env } from 'vs/base/common/process';
+
+export function isHotReloadEnabled(): boolean {
+	return !!env['VSCODE_DEV'];
+}
+export function registerHotReloadHandler(handler: HotReloadHandler): IDisposable {
+	if (!isHotReloadEnabled()) {
+		return { dispose() { } };
+	} else {
+		const handlers = registerGlobalHotReloadHandler();
+
+		handlers.add(handler);
+		return {
+			dispose() { handlers.delete(handler); }
+		};
+	}
+}
+
+/**
+ * Takes the old exports of the module to reload and returns a function to apply the new exports.
+ * If `undefined` is returned, this handler is not able to handle the module.
+ *
+ * If no handler can apply the new exports, the module will not be reloaded.
+ */
+export type HotReloadHandler = (oldExports: Record<string, unknown>) => AcceptNewExportsHandler | undefined;
+export type AcceptNewExportsHandler = (newExports: Record<string, unknown>) => boolean;
+
+function registerGlobalHotReloadHandler() {
+	if (!hotReloadHandlers) {
+		hotReloadHandlers = new Set();
+	}
+
+	const g = globalThis as unknown as GlobalThisAddition;
+	if (!g.$hotReload_applyNewExports) {
+		g.$hotReload_applyNewExports = oldExports => {
+			for (const h of hotReloadHandlers!) {
+				const result = h(oldExports);
+				if (result) { return result; }
+			}
+			return undefined;
+		};
+	}
+
+	return hotReloadHandlers;
+}
+
+let hotReloadHandlers: Set<(oldExports: Record<string, unknown>) => AcceptNewExportsFn | undefined> | undefined = undefined;
+
+interface GlobalThisAddition {
+	$hotReload_applyNewExports?(oldExports: Record<string, unknown>): AcceptNewExportsFn | undefined;
+}
+
+type AcceptNewExportsFn = (newExports: Record<string, unknown>) => boolean;
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts b/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts
index 8460b24326e..e2326b84447 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDimension } from 'vs/base/browser/dom';
+import { isHotReloadEnabled, registerHotReloadHandler } from 'vs/base/common/hotReload';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IObservable, IReader, ISettableObservable, autorun, autorunHandleChanges, autorunOpts, observableFromEvent, observableSignalFromEvent, observableValue, transaction } from 'vs/base/common/observable';
 import { ElementSizeObserver } from 'vs/editor/browser/config/elementSizeObserver';
@@ -294,28 +295,21 @@ export function readHotReloadableExport<T>(value: T, reader: IReader | undefined
 }
 
 export function observeHotReloadableExports(values: any[], reader: IReader | undefined): void {
-	const hotReload_deprecateExports = (globalThis as unknown as {
-		// This property it defined by the monaco editor playground server
-		$hotReload_deprecateExports: Set<(oldExports: Record<string, unknown>, newExports: Record<string, unknown>) => boolean>;
-	}).$hotReload_deprecateExports;
-	if (!hotReload_deprecateExports) {
-		return;
+	if (isHotReloadEnabled()) {
+		const o = observableSignalFromEvent(
+			'reload',
+			event => registerHotReloadHandler(oldExports => {
+				if (![...Object.values(oldExports)].some(v => values.includes(v))) {
+					return undefined;
+				}
+				return (_newExports) => {
+					event(undefined);
+					return true;
+				};
+			})
+		);
+		o.read(reader);
 	}
-
-	const o = observableSignalFromEvent('reload', e => {
-		function handleExports(oldExports: Record<string, unknown>, _newExports: Record<string, unknown>) {
-			if ([...Object.values(oldExports)].some(v => values.includes(v))) {
-				e(undefined);
-				return true;
-			}
-			return false;
-		}
-		hotReload_deprecateExports.add(handleExports);
-		return {
-			dispose() { hotReload_deprecateExports.delete(handleExports); }
-		};
-	});
-	o.read(reader);
 }
 
 export function applyViewZones(editor: ICodeEditor, viewZones: IObservable<IObservableViewZone[]>, setIsUpdating?: (isUpdatingViewZones: boolean) => void): IDisposable {

From e424e83820568bd3a954182020a730fc2972da7a Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 1 Sep 2023 12:23:31 +0200
Subject: [PATCH 28/94] Diff Algorithm Cleanup

---
 src/vs/base/common/arrays.ts                  |  24 +
 src/vs/base/common/arraysFind.ts              | 109 ++++
 src/vs/base/test/common/arraysFind.test.ts    |  58 +++
 .../browser/services/editorWorkerService.ts   |   9 +-
 .../editor/browser/widget/diffEditorWidget.ts |  16 +-
 .../diffEditorWidget2/accessibleDiffViewer.ts |  40 +-
 .../diffEditorDecorations.ts                  |  30 +-
 .../diffEditorWidget2/diffEditorViewModel.ts  |  15 +-
 .../diffEditorWidget2/diffEditorWidget2.ts    |  58 +--
 .../inlineDiffDeletedCodeMargin.ts            |  20 +-
 .../widget/diffEditorWidget2/lineAlignment.ts |  20 +-
 .../diffEditorWidget2/overviewRulerPart.ts    |   4 +-
 .../widget/workerBasedDocumentDiffProvider.ts |   4 +-
 src/vs/editor/common/core/lineRange.ts        | 222 ++++++---
 src/vs/editor/common/core/offsetRange.ts      |   8 +
 .../common/diff/advancedLinesDiffComputer.ts  | 465 ++++++------------
 .../common/diff/documentDiffProvider.ts       |   5 +-
 .../common/diff/legacyLinesDiffComputer.ts    |  27 +-
 .../editor/common/diff/linesDiffComputer.ts   | 142 +-----
 src/vs/editor/common/diff/rangeMapping.ts     | 133 +++++
 .../common/services/editorSimpleWorker.ts     |   7 +-
 .../standalone/browser/standaloneEditor.ts    |   7 +-
 .../browser/widget/diffEditorWidget2.test.ts  |   8 +-
 .../editor/test/common/core/lineRange.test.ts |  58 +++
 .../diffing/advancedLinesDiffComputer.test.ts | 100 ++++
 .../test/node/diffing/diffingFixture.test.ts  |   8 +-
 .../node/diffing/lineRangeMapping.test.ts     |  54 --
 .../browser/inlineChatLivePreviewWidget.ts    |  18 +-
 .../inlineChat/browser/inlineChatSession.ts   |  10 +-
 .../browser/inlineChatStrategies.ts           |   2 +-
 .../inlineChat/browser/inlineChatWidget.ts    |  12 +-
 .../mergeEditor/browser/model/diffComputer.ts |   6 +-
 .../mergeEditor/test/browser/model.test.ts    |   4 +-
 33 files changed, 965 insertions(+), 738 deletions(-)
 create mode 100644 src/vs/base/common/arraysFind.ts
 create mode 100644 src/vs/base/test/common/arraysFind.test.ts
 create mode 100644 src/vs/editor/common/diff/rangeMapping.ts
 create mode 100644 src/vs/editor/test/common/core/lineRange.test.ts
 create mode 100644 src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
 delete mode 100644 src/vs/editor/test/node/diffing/lineRangeMapping.test.ts

diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index 94966dc1b6f..71bedc3a440 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -177,6 +177,30 @@ export function groupBy<T>(data: ReadonlyArray<T>, compare: (a: T, b: T) => numb
 	return result;
 }
 
+/**
+ * Splits the given items into a list of (non-empty) groups.
+ * `shouldBeGrouped` is used to decide if two consecutive items should be in the same group.
+ * The order of the items is preserved.
+ */
+export function* groupAdjacentBy<T>(items: Iterable<T>, shouldBeGrouped: (item1: T, item2: T) => boolean): Iterable<T[]> {
+	let currentGroup: T[] | undefined;
+	let last: T | undefined;
+	for (const item of items) {
+		if (last !== undefined && shouldBeGrouped(last, item)) {
+			currentGroup!.push(item);
+		} else {
+			if (currentGroup) {
+				yield currentGroup;
+			}
+			currentGroup = [item];
+		}
+		last = item;
+	}
+	if (currentGroup) {
+		yield currentGroup;
+	}
+}
+
 interface IMutableSplice<T> extends ISplice<T> {
 	readonly toInsert: T[];
 	deleteCount: number;
diff --git a/src/vs/base/common/arraysFind.ts b/src/vs/base/common/arraysFind.ts
new file mode 100644
index 00000000000..91a1b710823
--- /dev/null
+++ b/src/vs/base/common/arraysFind.ts
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Finds the last item where predicate is true using binary search.
+ * `predicate` must be monotonous, i.e. `arr.map(predicate)` must be like `[true, ..., true, false, ..., false]`!
+ *
+ * @returns `undefined` if no item matches, otherwise the last item that matches the predicate.
+ */
+export function findLastMonotonous<T>(arr: T[], predicate: (item: T) => boolean): T | undefined {
+	const idx = findLastIdxMonotonous(arr, predicate);
+	return idx === -1 ? undefined : arr[idx];
+}
+
+/**
+ * Finds the last item where predicate is true using binary search.
+ * `predicate` must be monotonous, i.e. `arr.map(predicate)` must be like `[true, ..., true, false, ..., false]`!
+ *
+ * @returns `startIdx - 1` if predicate is false for all items, otherwise the index of the last item that matches the predicate.
+ */
+export function findLastIdxMonotonous<T>(arr: T[], predicate: (item: T) => boolean, startIdx = 0, endIdxEx = arr.length): number {
+	let i = startIdx;
+	let j = endIdxEx;
+	while (i < j) {
+		const k = Math.floor((i + j) / 2);
+		if (predicate(arr[k])) {
+			i = k + 1;
+		} else {
+			j = k;
+		}
+	}
+	return i - 1;
+}
+
+
+/**
+ * Finds the first item where predicate is true using binary search.
+ * `predicate` must be monotonous, i.e. `arr.map(predicate)` must be like `[false, ..., false, true, ..., true]`!
+ *
+ * @returns `undefined` if no item matches, otherwise the first item that matches the predicate.
+ */
+export function findFirstMonotonous<T>(arr: T[], predicate: (item: T) => boolean): T | undefined {
+	const idx = findFirstIdxMonotonousOrArrLen(arr, predicate);
+	return idx === arr.length ? undefined : arr[idx];
+}
+
+/**
+ * Finds the first item where predicate is true using binary search.
+ * `predicate` must be monotonous, i.e. `arr.map(predicate)` must be like `[false, ..., false, true, ..., true]`!
+ *
+ * @returns `endIdxEx` if predicate is false for all items, otherwise the index of the first item that matches the predicate.
+ */
+export function findFirstIdxMonotonousOrArrLen<T>(arr: T[], predicate: (item: T) => boolean, startIdx = 0, endIdxEx = arr.length): number {
+	let i = startIdx;
+	let j = endIdxEx;
+	while (i < j) {
+		const k = Math.floor((i + j) / 2);
+		if (predicate(arr[k])) {
+			j = k;
+		} else {
+			i = k + 1;
+		}
+	}
+	return i;
+}
+
+export function findFirstIdxMonotonous<T>(arr: T[], predicate: (item: T) => boolean, startIdx = 0, endIdxEx = arr.length): number {
+	const idx = findFirstIdxMonotonousOrArrLen(arr, predicate, startIdx, endIdxEx);
+	return idx === arr.length ? -1 : idx;
+}
+
+/**
+ * Use this when
+ * * You have a sorted array
+ * * You query this array with a monotonous predicate to find the last item that has a certain property.
+ * * You query this array multiple times with monotonous predicates that get weaker and weaker.
+ */
+export class MonotonousArray<T> {
+	public static assertInvariants = false;
+
+	private _findLastMonotonousLastIdx = 0;
+	private _lastPredicate: ((item: T) => boolean) | undefined;
+
+	constructor(private readonly _items: T[]) {
+	}
+
+	/**
+	 * The predicate must be monotonous, i.e. `arr.map(predicate)` must be like `[true, ..., true, false, ..., false]`!
+	 * For subsequent calls, current predicate must be weaker than (or equal to) the previous predicate, i.e. more entries must be `true`.
+	 */
+	findLastMonotonous(predicate: (item: T) => boolean): T | undefined {
+		if (MonotonousArray.assertInvariants) {
+			if (this._lastPredicate) {
+				for (const item of this._items) {
+					if (this._lastPredicate(item) && !predicate(item)) {
+						throw new Error('MonotonousArray: current predicate must be weaker than (or equal to) the previous predicate.');
+					}
+				}
+			}
+			this._lastPredicate = predicate;
+		}
+
+		const idx = findLastIdxMonotonous(this._items, predicate, this._findLastMonotonousLastIdx);
+		this._findLastMonotonousLastIdx = idx + 1;
+		return idx === -1 ? undefined : this._items[idx];
+	}
+}
diff --git a/src/vs/base/test/common/arraysFind.test.ts b/src/vs/base/test/common/arraysFind.test.ts
new file mode 100644
index 00000000000..db9fcc44b82
--- /dev/null
+++ b/src/vs/base/test/common/arraysFind.test.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert = require('assert');
+import { MonotonousArray, findFirstMonotonous, findLastMonotonous } from 'vs/base/common/arraysFind';
+
+suite('Arrays', () => {
+	test('findLastMonotonous', () => {
+		const array = [1, 4, 5, 7, 55, 59, 60, 61, 64, 69];
+
+		const result = findLastMonotonous(array, n => n <= 60);
+		assert.strictEqual(result, 60);
+
+		const result2 = findLastMonotonous(array, n => n <= 62);
+		assert.strictEqual(result2, 61);
+
+		const result3 = findLastMonotonous(array, n => n <= 1);
+		assert.strictEqual(result3, 1);
+
+		const result4 = findLastMonotonous(array, n => n <= 70);
+		assert.strictEqual(result4, 69);
+
+		const result5 = findLastMonotonous(array, n => n <= 0);
+		assert.strictEqual(result5, undefined);
+	});
+
+	test('findFirstMonotonous', () => {
+		const array = [1, 4, 5, 7, 55, 59, 60, 61, 64, 69];
+
+		const result = findFirstMonotonous(array, n => n >= 60);
+		assert.strictEqual(result, 60);
+
+		const result2 = findFirstMonotonous(array, n => n >= 62);
+		assert.strictEqual(result2, 64);
+
+		const result3 = findFirstMonotonous(array, n => n >= 1);
+		assert.strictEqual(result3, 1);
+
+		const result4 = findFirstMonotonous(array, n => n >= 70);
+		assert.strictEqual(result4, undefined);
+
+		const result5 = findFirstMonotonous(array, n => n >= 0);
+		assert.strictEqual(result5, 1);
+	});
+
+	test('MonotonousArray', () => {
+		const arr = new MonotonousArray([1, 4, 5, 7, 55, 59, 60, 61, 64, 69]);
+		assert.strictEqual(arr.findLastMonotonous(n => n <= 0), undefined);
+		assert.strictEqual(arr.findLastMonotonous(n => n <= 0), undefined);
+		assert.strictEqual(arr.findLastMonotonous(n => n <= 5), 5);
+		assert.strictEqual(arr.findLastMonotonous(n => n <= 6), 5);
+		assert.strictEqual(arr.findLastMonotonous(n => n <= 55), 55);
+		assert.strictEqual(arr.findLastMonotonous(n => n <= 60), 60);
+		assert.strictEqual(arr.findLastMonotonous(n => n <= 80), 69);
+	});
+});
diff --git a/src/vs/editor/browser/services/editorWorkerService.ts b/src/vs/editor/browser/services/editorWorkerService.ts
index 993fe8e813c..5b411eeec3c 100644
--- a/src/vs/editor/browser/services/editorWorkerService.ts
+++ b/src/vs/editor/browser/services/editorWorkerService.ts
@@ -26,7 +26,8 @@ import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
 import { IDocumentDiff, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { ILinesDiffComputerOptions, LineRangeMapping, MovedText, RangeMapping, SimpleLineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { ILinesDiffComputerOptions, MovedText } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping, RangeMapping, LineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 
 /**
@@ -107,15 +108,15 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 			quitEarly: result.quitEarly,
 			changes: toLineRangeMappings(result.changes),
 			moves: result.moves.map(m => new MovedText(
-				new SimpleLineRangeMapping(new LineRange(m[0], m[1]), new LineRange(m[2], m[3])),
+				new LineRangeMapping(new LineRange(m[0], m[1]), new LineRange(m[2], m[3])),
 				toLineRangeMappings(m[4])
 			))
 		};
 		return diff;
 
-		function toLineRangeMappings(changes: readonly ILineChange[]): readonly LineRangeMapping[] {
+		function toLineRangeMappings(changes: readonly ILineChange[]): readonly DetailedLineRangeMapping[] {
 			return changes.map(
-				(c) => new LineRangeMapping(
+				(c) => new DetailedLineRangeMapping(
 					new LineRange(c[0], c[1]),
 					new LineRange(c[2], c[3]),
 					c[4]?.map(
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index 62d42cee6aa..47dba6865b7 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -1212,24 +1212,24 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 						let modifiedEndLineNumber: number;
 						let innerChanges = m.innerChanges;
 
-						if (m.originalRange.isEmpty) {
+						if (m.original.isEmpty) {
 							// Insertion
-							originalStartLineNumber = m.originalRange.startLineNumber - 1;
+							originalStartLineNumber = m.original.startLineNumber - 1;
 							originalEndLineNumber = 0;
 							innerChanges = undefined;
 						} else {
-							originalStartLineNumber = m.originalRange.startLineNumber;
-							originalEndLineNumber = m.originalRange.endLineNumberExclusive - 1;
+							originalStartLineNumber = m.original.startLineNumber;
+							originalEndLineNumber = m.original.endLineNumberExclusive - 1;
 						}
 
-						if (m.modifiedRange.isEmpty) {
+						if (m.modified.isEmpty) {
 							// Deletion
-							modifiedStartLineNumber = m.modifiedRange.startLineNumber - 1;
+							modifiedStartLineNumber = m.modified.startLineNumber - 1;
 							modifiedEndLineNumber = 0;
 							innerChanges = undefined;
 						} else {
-							modifiedStartLineNumber = m.modifiedRange.startLineNumber;
-							modifiedEndLineNumber = m.modifiedRange.endLineNumberExclusive - 1;
+							modifiedStartLineNumber = m.modified.startLineNumber;
+							modifiedEndLineNumber = m.modified.endLineNumberExclusive - 1;
 						}
 
 						return {
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
index 32f45d85186..ce188250447 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
@@ -21,7 +21,7 @@ import { LineRange } from 'vs/editor/common/core/lineRange';
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
-import { LineRangeMapping, SimpleLineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping, LineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { ILanguageIdCodec } from 'vs/editor/common/languages';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
@@ -45,7 +45,7 @@ export class AccessibleDiffViewer extends Disposable {
 		private readonly _canClose: IObservable<boolean>,
 		private readonly _width: IObservable<number>,
 		private readonly _height: IObservable<number>,
-		private readonly _diffs: IObservable<LineRangeMapping[] | undefined>,
+		private readonly _diffs: IObservable<DetailedLineRangeMapping[] | undefined>,
 		private readonly _editors: DiffEditorEditors,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
@@ -105,7 +105,7 @@ class ViewModel extends Disposable {
 		= this._currentElementIdx.map((idx, r) => this.currentGroup.read(r)?.lines[idx]);
 
 	constructor(
-		private readonly _diffs: IObservable<LineRangeMapping[] | undefined>,
+		private readonly _diffs: IObservable<DetailedLineRangeMapping[] | undefined>,
 		private readonly _editors: DiffEditorEditors,
 		private readonly _setVisible: (visible: boolean, tx: ITransaction | undefined) => void,
 		public readonly canClose: IObservable<boolean>,
@@ -154,7 +154,7 @@ class ViewModel extends Disposable {
 			// This ensures editor commands (like revert/stage) work
 			const currentViewItem = this.currentElement.read(reader);
 			if (currentViewItem && currentViewItem.type !== LineType.Header) {
-				const lineNumber = currentViewItem.modifiedLineNumber ?? currentViewItem.diff.modifiedRange.startLineNumber;
+				const lineNumber = currentViewItem.modifiedLineNumber ?? currentViewItem.diff.modified.startLineNumber;
 				this._editors.modified.setSelection(Range.fromPositions(new Position(lineNumber, 1)));
 			}
 		}));
@@ -221,44 +221,44 @@ class ViewModel extends Disposable {
 
 const viewElementGroupLineMargin = 3;
 
-function computeViewElementGroups(diffs: LineRangeMapping[], originalLineCount: number, modifiedLineCount: number): ViewElementGroup[] {
+function computeViewElementGroups(diffs: DetailedLineRangeMapping[], originalLineCount: number, modifiedLineCount: number): ViewElementGroup[] {
 	const result: ViewElementGroup[] = [];
 
-	for (const g of group(diffs, (a, b) => (b.modifiedRange.startLineNumber - a.modifiedRange.endLineNumberExclusive < 2 * viewElementGroupLineMargin))) {
+	for (const g of group(diffs, (a, b) => (b.modified.startLineNumber - a.modified.endLineNumberExclusive < 2 * viewElementGroupLineMargin))) {
 		const viewElements: ViewElement[] = [];
 		viewElements.push(new HeaderViewElement());
 
 		const origFullRange = new LineRange(
-			Math.max(1, g[0].originalRange.startLineNumber - viewElementGroupLineMargin),
-			Math.min(g[g.length - 1].originalRange.endLineNumberExclusive + viewElementGroupLineMargin, originalLineCount + 1)
+			Math.max(1, g[0].original.startLineNumber - viewElementGroupLineMargin),
+			Math.min(g[g.length - 1].original.endLineNumberExclusive + viewElementGroupLineMargin, originalLineCount + 1)
 		);
 		const modifiedFullRange = new LineRange(
-			Math.max(1, g[0].modifiedRange.startLineNumber - viewElementGroupLineMargin),
-			Math.min(g[g.length - 1].modifiedRange.endLineNumberExclusive + viewElementGroupLineMargin, modifiedLineCount + 1)
+			Math.max(1, g[0].modified.startLineNumber - viewElementGroupLineMargin),
+			Math.min(g[g.length - 1].modified.endLineNumberExclusive + viewElementGroupLineMargin, modifiedLineCount + 1)
 		);
 
 		forEachAdjacentItems(g, (a, b) => {
-			const origRange = new LineRange(a ? a.originalRange.endLineNumberExclusive : origFullRange.startLineNumber, b ? b.originalRange.startLineNumber : origFullRange.endLineNumberExclusive);
-			const modifiedRange = new LineRange(a ? a.modifiedRange.endLineNumberExclusive : modifiedFullRange.startLineNumber, b ? b.modifiedRange.startLineNumber : modifiedFullRange.endLineNumberExclusive);
+			const origRange = new LineRange(a ? a.original.endLineNumberExclusive : origFullRange.startLineNumber, b ? b.original.startLineNumber : origFullRange.endLineNumberExclusive);
+			const modifiedRange = new LineRange(a ? a.modified.endLineNumberExclusive : modifiedFullRange.startLineNumber, b ? b.modified.startLineNumber : modifiedFullRange.endLineNumberExclusive);
 
 			origRange.forEach(origLineNumber => {
 				viewElements.push(new UnchangedLineViewElement(origLineNumber, modifiedRange.startLineNumber + (origLineNumber - origRange.startLineNumber)));
 			});
 
 			if (b) {
-				b.originalRange.forEach(origLineNumber => {
+				b.original.forEach(origLineNumber => {
 					viewElements.push(new DeletedLineViewElement(b, origLineNumber));
 				});
-				b.modifiedRange.forEach(modifiedLineNumber => {
+				b.modified.forEach(modifiedLineNumber => {
 					viewElements.push(new AddedLineViewElement(b, modifiedLineNumber));
 				});
 			}
 		});
 
-		const modifiedRange = g[0].modifiedRange.join(g[g.length - 1].modifiedRange);
-		const originalRange = g[0].originalRange.join(g[g.length - 1].originalRange);
+		const modifiedRange = g[0].modified.join(g[g.length - 1].modified);
+		const originalRange = g[0].original.join(g[g.length - 1].original);
 
-		result.push(new ViewElementGroup(new SimpleLineRangeMapping(modifiedRange, originalRange), viewElements));
+		result.push(new ViewElementGroup(new LineRangeMapping(modifiedRange, originalRange), viewElements));
 	}
 	return result;
 }
@@ -272,7 +272,7 @@ enum LineType {
 
 class ViewElementGroup {
 	constructor(
-		public readonly range: SimpleLineRangeMapping,
+		public readonly range: LineRangeMapping,
 		public readonly lines: readonly ViewElement[],
 	) { }
 }
@@ -289,7 +289,7 @@ class DeletedLineViewElement {
 	public readonly modifiedLineNumber = undefined;
 
 	constructor(
-		public readonly diff: LineRangeMapping,
+		public readonly diff: DetailedLineRangeMapping,
 		public readonly originalLineNumber: number,
 	) {
 	}
@@ -301,7 +301,7 @@ class AddedLineViewElement {
 	public readonly originalLineNumber = undefined;
 
 	constructor(
-		public readonly diff: LineRangeMapping,
+		public readonly diff: DetailedLineRangeMapping,
 		public readonly modifiedLineNumber: number,
 	) {
 	}
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts
index 9a4b5bcf094..504bfe8a12c 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts
@@ -42,45 +42,45 @@ export class DiffEditorDecorations extends Disposable {
 		const modifiedDecorations: IModelDeltaDecoration[] = [];
 		if (!movedTextToCompare) {
 			for (const m of diff.mappings) {
-				if (!m.lineRangeMapping.originalRange.isEmpty) {
-					originalDecorations.push({ range: m.lineRangeMapping.originalRange.toInclusiveRange()!, options: renderIndicators ? diffLineDeleteDecorationBackgroundWithIndicator : diffLineDeleteDecorationBackground });
+				if (!m.lineRangeMapping.original.isEmpty) {
+					originalDecorations.push({ range: m.lineRangeMapping.original.toInclusiveRange()!, options: renderIndicators ? diffLineDeleteDecorationBackgroundWithIndicator : diffLineDeleteDecorationBackground });
 				}
-				if (!m.lineRangeMapping.modifiedRange.isEmpty) {
-					modifiedDecorations.push({ range: m.lineRangeMapping.modifiedRange.toInclusiveRange()!, options: renderIndicators ? diffLineAddDecorationBackgroundWithIndicator : diffLineAddDecorationBackground });
+				if (!m.lineRangeMapping.modified.isEmpty) {
+					modifiedDecorations.push({ range: m.lineRangeMapping.modified.toInclusiveRange()!, options: renderIndicators ? diffLineAddDecorationBackgroundWithIndicator : diffLineAddDecorationBackground });
 				}
 
-				if (m.lineRangeMapping.modifiedRange.isEmpty || m.lineRangeMapping.originalRange.isEmpty) {
-					if (!m.lineRangeMapping.originalRange.isEmpty) {
-						originalDecorations.push({ range: m.lineRangeMapping.originalRange.toInclusiveRange()!, options: diffWholeLineDeleteDecoration });
+				if (m.lineRangeMapping.modified.isEmpty || m.lineRangeMapping.original.isEmpty) {
+					if (!m.lineRangeMapping.original.isEmpty) {
+						originalDecorations.push({ range: m.lineRangeMapping.original.toInclusiveRange()!, options: diffWholeLineDeleteDecoration });
 					}
-					if (!m.lineRangeMapping.modifiedRange.isEmpty) {
-						modifiedDecorations.push({ range: m.lineRangeMapping.modifiedRange.toInclusiveRange()!, options: diffWholeLineAddDecoration });
+					if (!m.lineRangeMapping.modified.isEmpty) {
+						modifiedDecorations.push({ range: m.lineRangeMapping.modified.toInclusiveRange()!, options: diffWholeLineAddDecoration });
 					}
 				} else {
 					for (const i of m.lineRangeMapping.innerChanges || []) {
 						// Don't show empty markers outside the line range
-						if (m.lineRangeMapping.originalRange.contains(i.originalRange.startLineNumber)) {
+						if (m.lineRangeMapping.original.contains(i.originalRange.startLineNumber)) {
 							originalDecorations.push({ range: i.originalRange, options: (i.originalRange.isEmpty() && showEmptyDecorations) ? diffDeleteDecorationEmpty : diffDeleteDecoration });
 						}
-						if (m.lineRangeMapping.modifiedRange.contains(i.modifiedRange.startLineNumber)) {
+						if (m.lineRangeMapping.modified.contains(i.modifiedRange.startLineNumber)) {
 							modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations) ? diffAddDecorationEmpty : diffAddDecoration });
 						}
 					}
 				}
 
-				if (!m.lineRangeMapping.modifiedRange.isEmpty && this._options.shouldRenderRevertArrows.read(reader) && !movedTextToCompare) {
-					modifiedDecorations.push({ range: Range.fromPositions(new Position(m.lineRangeMapping.modifiedRange.startLineNumber, 1)), options: arrowRevertChange });
+				if (!m.lineRangeMapping.modified.isEmpty && this._options.shouldRenderRevertArrows.read(reader) && !movedTextToCompare) {
+					modifiedDecorations.push({ range: Range.fromPositions(new Position(m.lineRangeMapping.modified.startLineNumber, 1)), options: arrowRevertChange });
 				}
 			}
 		}
 
 		if (movedTextToCompare) {
 			for (const m of movedTextToCompare.changes) {
-				const fullRangeOriginal = m.originalRange.toInclusiveRange();
+				const fullRangeOriginal = m.original.toInclusiveRange();
 				if (fullRangeOriginal) {
 					originalDecorations.push({ range: fullRangeOriginal, options: renderIndicators ? diffLineDeleteDecorationBackgroundWithIndicator : diffLineDeleteDecorationBackground });
 				}
-				const fullRangeModified = m.modifiedRange.toInclusiveRange();
+				const fullRangeModified = m.modified.toInclusiveRange();
 				if (fullRangeModified) {
 					modifiedDecorations.push({ range: fullRangeModified, options: renderIndicators ? diffLineAddDecorationBackgroundWithIndicator : diffLineAddDecorationBackground });
 				}
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
index 860afa96659..143b1834b66 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
@@ -11,7 +11,8 @@ import { readHotReloadableExport } from 'vs/editor/browser/widget/diffEditorWidg
 import { ISerializedLineRange, LineRange } from 'vs/editor/common/core/lineRange';
 import { AdvancedLinesDiffComputer } from 'vs/editor/common/diff/advancedLinesDiffComputer';
 import { IDocumentDiff, IDocumentDiffProvider } from 'vs/editor/common/diff/documentDiffProvider';
-import { LineRangeMapping, MovedText } from 'vs/editor/common/diff/linesDiffComputer';
+import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { IDiffEditorModel, IDiffEditorViewModel } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { TextEditInfo } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper';
@@ -293,7 +294,7 @@ export class DiffState {
 
 export class DiffMapping {
 	constructor(
-		readonly lineRangeMapping: LineRangeMapping,
+		readonly lineRangeMapping: DetailedLineRangeMapping,
 	) {
 		/*
 		readonly movedTo: MovedText | undefined,
@@ -318,19 +319,19 @@ export class DiffMapping {
 
 export class UnchangedRegion {
 	public static fromDiffs(
-		changes: readonly LineRangeMapping[],
+		changes: readonly DetailedLineRangeMapping[],
 		originalLineCount: number,
 		modifiedLineCount: number,
 		minHiddenLineCount: number,
 		minContext: number,
 	): UnchangedRegion[] {
-		const inversedMappings = LineRangeMapping.inverse(changes, originalLineCount, modifiedLineCount);
+		const inversedMappings = DetailedLineRangeMapping.inverse(changes, originalLineCount, modifiedLineCount);
 		const result: UnchangedRegion[] = [];
 
 		for (const mapping of inversedMappings) {
-			let origStart = mapping.originalRange.startLineNumber;
-			let modStart = mapping.modifiedRange.startLineNumber;
-			let length = mapping.originalRange.length;
+			let origStart = mapping.original.startLineNumber;
+			let modStart = mapping.modified.startLineNumber;
+			let length = mapping.original.length;
 
 			const atStart = origStart === 1 && modStart === 1;
 			const atEnd = origStart + length === originalLineCount + 1 && modStart + length === modifiedLineCount + 1;
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
index 9d5047da806..94af3098934 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
@@ -29,7 +29,7 @@ import { IDimension } from 'vs/editor/common/core/dimension';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { IDiffComputationResult, ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
 import { EditorType, IDiffEditorModel, IDiffEditorViewModel, IDiffEditorViewState } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
@@ -248,8 +248,8 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 				const diffs = model.diff.get()?.mappings;
 				if (!diffs) { return; }
 				const diff = diffs.find(d =>
-					viewZone?.detail.afterLineNumber === d.lineRangeMapping.modifiedRange.startLineNumber - 1 ||
-					d.lineRangeMapping.modifiedRange.startLineNumber === lineNumber
+					viewZone?.detail.afterLineNumber === d.lineRangeMapping.modified.startLineNumber - 1 ||
+					d.lineRangeMapping.modified.startLineNumber === lineNumber
 				);
 				if (!diff) { return; }
 				this.revert(diff.lineRangeMapping);
@@ -260,10 +260,10 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 
 		this._register(Event.runAndSubscribe(this._editors.modified.onDidChangeCursorPosition, (e) => {
 			if (e?.reason === CursorChangeReason.Explicit) {
-				const diff = this._diffModel.get()?.diff.get()?.mappings.find(m => m.lineRangeMapping.modifiedRange.contains(e.position.lineNumber));
-				if (diff?.lineRangeMapping.modifiedRange.isEmpty) {
+				const diff = this._diffModel.get()?.diff.get()?.mappings.find(m => m.lineRangeMapping.modified.contains(e.position.lineNumber));
+				if (diff?.lineRangeMapping.modified.isEmpty) {
 					this._audioCueService.playAudioCue(AudioCue.diffLineDeleted, { source: 'diffEditor.cursorPositionChanged' });
-				} else if (diff?.lineRangeMapping.originalRange.isEmpty) {
+				} else if (diff?.lineRangeMapping.original.isEmpty) {
 					this._audioCueService.playAudioCue(AudioCue.diffLineInserted, { source: 'diffEditor.cursorPositionChanged' });
 				} else if (diff) {
 					this._audioCueService.playAudioCue(AudioCue.diffLineModified, { source: 'diffEditor.cursorPositionChanged' });
@@ -436,7 +436,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 		};
 	}
 
-	revert(diff: LineRangeMapping): void {
+	revert(diff: DetailedLineRangeMapping): void {
 		const model = this._diffModel.get()?.model;
 		if (!model) { return; }
 
@@ -447,8 +447,8 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 			}))
 			: [
 				{
-					range: diff.modifiedRange.toExclusiveRange(),
-					text: model.original.getValueInRange(diff.originalRange.toExclusiveRange())
+					range: diff.modified.toExclusiveRange(),
+					text: model.original.getValueInRange(diff.original.toExclusiveRange())
 				}
 			];
 
@@ -456,8 +456,8 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 	}
 
 	private _goTo(diff: DiffMapping): void {
-		this._editors.modified.setPosition(new Position(diff.lineRangeMapping.modifiedRange.startLineNumber, 1));
-		this._editors.modified.revealRangeInCenter(diff.lineRangeMapping.modifiedRange.toExclusiveRange());
+		this._editors.modified.setPosition(new Position(diff.lineRangeMapping.modified.startLineNumber, 1));
+		this._editors.modified.revealRangeInCenter(diff.lineRangeMapping.modified.toExclusiveRange());
 	}
 
 	goToDiff(target: 'previous' | 'next'): void {
@@ -470,15 +470,15 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 
 		let diff: DiffMapping | undefined;
 		if (target === 'next') {
-			diff = diffs.find(d => d.lineRangeMapping.modifiedRange.startLineNumber > curLineNumber) ?? diffs[0];
+			diff = diffs.find(d => d.lineRangeMapping.modified.startLineNumber > curLineNumber) ?? diffs[0];
 		} else {
-			diff = findLast(diffs, d => d.lineRangeMapping.modifiedRange.startLineNumber < curLineNumber) ?? diffs[diffs.length - 1];
+			diff = findLast(diffs, d => d.lineRangeMapping.modified.startLineNumber < curLineNumber) ?? diffs[diffs.length - 1];
 		}
 		this._goTo(diff);
 
-		if (diff.lineRangeMapping.modifiedRange.isEmpty) {
+		if (diff.lineRangeMapping.modified.isEmpty) {
 			this._audioCueService.playAudioCue(AudioCue.diffLineDeleted, { source: 'diffEditor.goToDiff' });
-		} else if (diff.lineRangeMapping.originalRange.isEmpty) {
+		} else if (diff.lineRangeMapping.original.isEmpty) {
 			this._audioCueService.playAudioCue(AudioCue.diffLineInserted, { source: 'diffEditor.goToDiff' });
 		} else if (diff) {
 			this._audioCueService.playAudioCue(AudioCue.diffLineModified, { source: 'diffEditor.goToDiff' });
@@ -564,26 +564,26 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 	}
 }
 
-function translatePosition(posInOriginal: Position, mappings: LineRangeMapping[]): Range {
-	const mapping = findLast(mappings, m => m.originalRange.startLineNumber <= posInOriginal.lineNumber);
+function translatePosition(posInOriginal: Position, mappings: DetailedLineRangeMapping[]): Range {
+	const mapping = findLast(mappings, m => m.original.startLineNumber <= posInOriginal.lineNumber);
 	if (!mapping) {
 		// No changes before the position
 		return Range.fromPositions(posInOriginal);
 	}
 
-	if (mapping.originalRange.endLineNumberExclusive <= posInOriginal.lineNumber) {
-		const newLineNumber = posInOriginal.lineNumber - mapping.originalRange.endLineNumberExclusive + mapping.modifiedRange.endLineNumberExclusive;
+	if (mapping.original.endLineNumberExclusive <= posInOriginal.lineNumber) {
+		const newLineNumber = posInOriginal.lineNumber - mapping.original.endLineNumberExclusive + mapping.modified.endLineNumberExclusive;
 		return Range.fromPositions(new Position(newLineNumber, posInOriginal.column));
 	}
 
 	if (!mapping.innerChanges) {
 		// Only for legacy algorithm
-		return Range.fromPositions(new Position(mapping.modifiedRange.startLineNumber, 1));
+		return Range.fromPositions(new Position(mapping.modified.startLineNumber, 1));
 	}
 
 	const innerMapping = findLast(mapping.innerChanges, m => m.originalRange.getStartPosition().isBeforeOrEqual(posInOriginal));
 	if (!innerMapping) {
-		const newLineNumber = posInOriginal.lineNumber - mapping.originalRange.startLineNumber + mapping.modifiedRange.startLineNumber;
+		const newLineNumber = posInOriginal.lineNumber - mapping.original.startLineNumber + mapping.modified.startLineNumber;
 		return Range.fromPositions(new Position(newLineNumber, posInOriginal.column));
 	}
 
@@ -620,24 +620,24 @@ function toLineChanges(state: DiffState): ILineChange[] {
 		let modifiedEndLineNumber: number;
 		let innerChanges = m.innerChanges;
 
-		if (m.originalRange.isEmpty) {
+		if (m.original.isEmpty) {
 			// Insertion
-			originalStartLineNumber = m.originalRange.startLineNumber - 1;
+			originalStartLineNumber = m.original.startLineNumber - 1;
 			originalEndLineNumber = 0;
 			innerChanges = undefined;
 		} else {
-			originalStartLineNumber = m.originalRange.startLineNumber;
-			originalEndLineNumber = m.originalRange.endLineNumberExclusive - 1;
+			originalStartLineNumber = m.original.startLineNumber;
+			originalEndLineNumber = m.original.endLineNumberExclusive - 1;
 		}
 
-		if (m.modifiedRange.isEmpty) {
+		if (m.modified.isEmpty) {
 			// Deletion
-			modifiedStartLineNumber = m.modifiedRange.startLineNumber - 1;
+			modifiedStartLineNumber = m.modified.startLineNumber - 1;
 			modifiedEndLineNumber = 0;
 			innerChanges = undefined;
 		} else {
-			modifiedStartLineNumber = m.modifiedRange.startLineNumber;
-			modifiedEndLineNumber = m.modifiedRange.endLineNumberExclusive - 1;
+			modifiedStartLineNumber = m.modified.startLineNumber;
+			modifiedEndLineNumber = m.modified.endLineNumberExclusive - 1;
 		}
 
 		return {
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/inlineDiffDeletedCodeMargin.ts b/src/vs/editor/browser/widget/diffEditorWidget2/inlineDiffDeletedCodeMargin.ts
index 5aca1405d41..f5b3ff67e26 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/inlineDiffDeletedCodeMargin.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/inlineDiffDeletedCodeMargin.ts
@@ -13,7 +13,7 @@ import { IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrow
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { DiffEditorWidget2 } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
 import { localize } from 'vs/nls';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -39,7 +39,7 @@ export class InlineDiffDeletedCodeMargin extends Disposable {
 		private readonly _getViewZoneId: () => string,
 		private readonly _marginDomNode: HTMLElement,
 		private readonly _modifiedEditor: CodeEditorWidget,
-		private readonly _diff: LineRangeMapping,
+		private readonly _diff: DetailedLineRangeMapping,
 		private readonly _editor: DiffEditorWidget2,
 		private readonly _viewLineCounts: number[],
 		private readonly _originalTextModel: ITextModel,
@@ -70,38 +70,38 @@ export class InlineDiffDeletedCodeMargin extends Disposable {
 				getAnchor: () => ({ x, y }),
 				getActions: () => {
 					const actions: Action[] = [];
-					const isDeletion = _diff.modifiedRange.isEmpty;
+					const isDeletion = _diff.modified.isEmpty;
 
 					// default action
 					actions.push(new Action(
 						'diff.clipboard.copyDeletedContent',
 						isDeletion
-							? (_diff.originalRange.length > 1
+							? (_diff.original.length > 1
 								? localize('diff.clipboard.copyDeletedLinesContent.label', "Copy deleted lines")
 								: localize('diff.clipboard.copyDeletedLinesContent.single.label', "Copy deleted line"))
-							: (_diff.originalRange.length > 1
+							: (_diff.original.length > 1
 								? localize('diff.clipboard.copyChangedLinesContent.label', "Copy changed lines")
 								: localize('diff.clipboard.copyChangedLinesContent.single.label', "Copy changed line")),
 						undefined,
 						true,
 						async () => {
-							const originalText = this._originalTextModel.getValueInRange(_diff.originalRange.toExclusiveRange());
+							const originalText = this._originalTextModel.getValueInRange(_diff.original.toExclusiveRange());
 							await this._clipboardService.writeText(originalText);
 						}
 					));
 
-					if (_diff.originalRange.length > 1) {
+					if (_diff.original.length > 1) {
 						actions.push(new Action(
 							'diff.clipboard.copyDeletedLineContent',
 							isDeletion
 								? localize('diff.clipboard.copyDeletedLineContent.label', "Copy deleted line ({0})",
-									_diff.originalRange.startLineNumber + currentLineNumberOffset)
+									_diff.original.startLineNumber + currentLineNumberOffset)
 								: localize('diff.clipboard.copyChangedLineContent.label', "Copy changed line ({0})",
-									_diff.originalRange.startLineNumber + currentLineNumberOffset),
+									_diff.original.startLineNumber + currentLineNumberOffset),
 							undefined,
 							true,
 							async () => {
-								let lineContent = this._originalTextModel.getLineContent(_diff.originalRange.startLineNumber + currentLineNumberOffset);
+								let lineContent = this._originalTextModel.getLineContent(_diff.original.startLineNumber + currentLineNumberOffset);
 								if (lineContent === '') {
 									// empty line -> new line
 									const eof = this._originalTextModel.getEndOfLineSequence();
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts b/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts
index 56357753f62..32d34563d46 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts
@@ -25,7 +25,7 @@ import { animatedObservable, joinCombine } from 'vs/editor/browser/widget/diffEd
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { Position } from 'vs/editor/common/core/position';
-import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { BackgroundTokenizationState } from 'vs/editor/common/tokenizationTextModelPart';
 import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel';
@@ -193,7 +193,7 @@ export class ViewZoneManager extends Disposable {
 						const decorations: InlineDecoration[] = [];
 						for (const i of a.diff.innerChanges || []) {
 							decorations.push(new InlineDecoration(
-								i.originalRange.delta(-(a.diff.originalRange.startLineNumber - 1)),
+								i.originalRange.delta(-(a.diff.original.startLineNumber - 1)),
 								diffDeleteDecoration.className!,
 								InlineDecorationType.Regular
 							));
@@ -287,7 +287,7 @@ export class ViewZoneManager extends Disposable {
 						}
 
 						let marginDomNode: HTMLElement | undefined = undefined;
-						if (a.diff && a.diff.modifiedRange.isEmpty && this._options.shouldRenderRevertArrows.read(reader)) {
+						if (a.diff && a.diff.modified.isEmpty && this._options.shouldRenderRevertArrows.read(reader)) {
 							marginDomNode = createViewZoneMarginArrow();
 						}
 
@@ -472,7 +472,7 @@ interface ILineRangeAlignment {
 	 * If this range alignment is a direct result of a diff, then this is the diff's line mapping.
 	 * Only used for inline-view.
 	 */
-	diff?: LineRangeMapping;
+	diff?: DetailedLineRangeMapping;
 }
 
 function computeRangeAlignment(
@@ -540,11 +540,11 @@ function computeRangeAlignment(
 
 	for (const m of diffs) {
 		const c = m.lineRangeMapping;
-		handleAlignmentsOutsideOfDiffs(c.originalRange.startLineNumber, c.modifiedRange.startLineNumber);
+		handleAlignmentsOutsideOfDiffs(c.original.startLineNumber, c.modified.startLineNumber);
 
 		let first = true;
-		let lastModLineNumber = c.modifiedRange.startLineNumber;
-		let lastOrigLineNumber = c.originalRange.startLineNumber;
+		let lastModLineNumber = c.modified.startLineNumber;
+		let lastOrigLineNumber = c.original.startLineNumber;
 
 		function emitAlignment(origLineNumberExclusive: number, modLineNumberExclusive: number) {
 			if (origLineNumberExclusive < lastOrigLineNumber || modLineNumberExclusive < lastModLineNumber) {
@@ -593,10 +593,10 @@ function computeRangeAlignment(
 			}
 		}
 
-		emitAlignment(c.originalRange.endLineNumberExclusive, c.modifiedRange.endLineNumberExclusive);
+		emitAlignment(c.original.endLineNumberExclusive, c.modified.endLineNumberExclusive);
 
-		lastOriginalLineNumber = c.originalRange.endLineNumberExclusive;
-		lastModifiedLineNumber = c.modifiedRange.endLineNumberExclusive;
+		lastOriginalLineNumber = c.original.endLineNumberExclusive;
+		lastModifiedLineNumber = c.modified.endLineNumberExclusive;
 	}
 	handleAlignmentsOutsideOfDiffs(Number.MAX_VALUE, Number.MAX_VALUE);
 
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/overviewRulerPart.ts b/src/vs/editor/browser/widget/diffEditorWidget2/overviewRulerPart.ts
index 8996560b36a..bd93df81567 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/overviewRulerPart.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/overviewRulerPart.ts
@@ -127,8 +127,8 @@ export class OverviewRulerPart extends Disposable {
 							});
 					}
 
-					const originalZones = createZones((diff || []).map(d => d.lineRangeMapping.originalRange), colors.removeColor, this._editors.original);
-					const modifiedZones = createZones((diff || []).map(d => d.lineRangeMapping.modifiedRange), colors.insertColor, this._editors.modified);
+					const originalZones = createZones((diff || []).map(d => d.lineRangeMapping.original), colors.removeColor, this._editors.original);
+					const modifiedZones = createZones((diff || []).map(d => d.lineRangeMapping.modified), colors.insertColor, this._editors.modified);
 					originalOverviewRuler?.setZones(originalZones);
 					modifiedOverviewRuler?.setZones(modifiedZones);
 				}));
diff --git a/src/vs/editor/browser/widget/workerBasedDocumentDiffProvider.ts b/src/vs/editor/browser/widget/workerBasedDocumentDiffProvider.ts
index 02d3c157aa6..79d7bacac9f 100644
--- a/src/vs/editor/browser/widget/workerBasedDocumentDiffProvider.ts
+++ b/src/vs/editor/browser/widget/workerBasedDocumentDiffProvider.ts
@@ -9,7 +9,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { IDocumentDiff, IDocumentDiffProvider, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { LineRangeMapping, RangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { ITextModel } from 'vs/editor/common/model';
 import { DiffAlgorithmName, IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -53,7 +53,7 @@ export class WorkerBasedDocumentDiffProvider implements IDocumentDiffProvider, I
 
 			return {
 				changes: [
-					new LineRangeMapping(
+					new DetailedLineRangeMapping(
 						new LineRange(1, 2),
 						new LineRange(1, modified.getLineCount() + 1),
 						[
diff --git a/src/vs/editor/common/core/lineRange.ts b/src/vs/editor/common/core/lineRange.ts
index 70acb0476d6..3bf932cac4d 100644
--- a/src/vs/editor/common/core/lineRange.ts
+++ b/src/vs/editor/common/core/lineRange.ts
@@ -6,6 +6,7 @@
 import { BugIndicatingError } from 'vs/base/common/errors';
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
 import { Range } from 'vs/editor/common/core/range';
+import { findFirstIdxMonotonousOrArrLen, findLastIdxMonotonous, findLastMonotonous } from 'vs/base/common/arraysFind';
 
 /**
  * A range of lines (1-based).
@@ -40,66 +41,11 @@ export class LineRange {
 		if (lineRanges.length === 0) {
 			return [];
 		}
-		let result = lineRanges[0];
+		let result = new LineRangeSet(lineRanges[0].slice());
 		for (let i = 1; i < lineRanges.length; i++) {
-			result = this.join(result, lineRanges[i]);
+			result = result.getUnion(new LineRangeSet(lineRanges[i].slice()));
 		}
-		return result;
-	}
-
-	/**
-	 * @param lineRanges1 Must be sorted.
-	 * @param lineRanges2 Must be sorted.
-	 */
-	public static join(lineRanges1: readonly LineRange[], lineRanges2: readonly LineRange[]): readonly LineRange[] {
-		if (lineRanges1.length === 0) {
-			return lineRanges2;
-		}
-		if (lineRanges2.length === 0) {
-			return lineRanges1;
-		}
-
-		const result: LineRange[] = [];
-		let i1 = 0;
-		let i2 = 0;
-		let current: LineRange | null = null;
-		while (i1 < lineRanges1.length || i2 < lineRanges2.length) {
-			let next: LineRange | null = null;
-			if (i1 < lineRanges1.length && i2 < lineRanges2.length) {
-				const lineRange1 = lineRanges1[i1];
-				const lineRange2 = lineRanges2[i2];
-				if (lineRange1.startLineNumber < lineRange2.startLineNumber) {
-					next = lineRange1;
-					i1++;
-				} else {
-					next = lineRange2;
-					i2++;
-				}
-			} else if (i1 < lineRanges1.length) {
-				next = lineRanges1[i1];
-				i1++;
-			} else {
-				next = lineRanges2[i2];
-				i2++;
-			}
-
-			if (current === null) {
-				current = next;
-			} else {
-				if (current.endLineNumberExclusive >= next.startLineNumber) {
-					// merge
-					current = new LineRange(current.startLineNumber, Math.max(current.endLineNumberExclusive, next.endLineNumberExclusive));
-				} else {
-					// push
-					result.push(current);
-					current = next;
-				}
-			}
-		}
-		if (current !== null) {
-			result.push(current);
-		}
-		return result;
+		return result.ranges;
 	}
 
 	public static ofLength(startLineNumber: number, length: number): LineRange {
@@ -251,3 +197,163 @@ export class LineRange {
 }
 
 export type ISerializedLineRange = [startLineNumber: number, endLineNumberExclusive: number];
+
+
+export class LineRangeSet {
+	constructor(
+		/**
+		 * Sorted by start line number.
+		 * No two line ranges are touching or intersecting.
+		 */
+		private readonly _normalizedRanges: LineRange[] = []
+	) {
+	}
+
+	get ranges(): readonly LineRange[] {
+		return this._normalizedRanges;
+	}
+
+	addRange(range: LineRange): void {
+		if (range.length === 0) {
+			return;
+		}
+
+		// Idea: Find joinRange such that:
+		// replaceRange = _normalizedRanges.replaceRange(joinRange, range.joinAll(joinRange.map(idx => this._normalizedRanges[idx])))
+
+		// idx of first element that touches range or that is after range
+		const joinRangeStartIdx = findFirstIdxMonotonousOrArrLen(this._normalizedRanges, r => r.endLineNumberExclusive >= range.startLineNumber);
+		// idx of element after { last element that touches range or that is before range }
+		const joinRangeEndIdxExclusive = findLastIdxMonotonous(this._normalizedRanges, r => r.startLineNumber <= range.endLineNumberExclusive) + 1;
+
+		if (joinRangeStartIdx === joinRangeEndIdxExclusive) {
+			// If there is no element that touches range, then joinRangeStartIdx === joinRangeEndIdxExclusive and that value is the index of the element after range
+			this._normalizedRanges.splice(joinRangeStartIdx, 0, range);
+		} else if (joinRangeStartIdx === joinRangeEndIdxExclusive - 1) {
+			// Else, there is an element that touches range and in this case it is both the first and last element. Thus we can replace it
+			const joinRange = this._normalizedRanges[joinRangeStartIdx];
+			this._normalizedRanges[joinRangeStartIdx] = joinRange.join(range);
+		} else {
+			// First and last element are different - we need to replace the entire range
+			const joinRange = this._normalizedRanges[joinRangeStartIdx].join(this._normalizedRanges[joinRangeEndIdxExclusive - 1]).join(range);
+			this._normalizedRanges.splice(joinRangeStartIdx, joinRangeEndIdxExclusive - joinRangeStartIdx, joinRange);
+		}
+	}
+
+	intersects(range: LineRange): boolean {
+		const rangeThatStartsBeforeEnd = findLastMonotonous(this._normalizedRanges, r => r.startLineNumber < range.endLineNumberExclusive);
+		return !!rangeThatStartsBeforeEnd && rangeThatStartsBeforeEnd.endLineNumberExclusive > range.startLineNumber;
+	}
+
+	getUnion(other: LineRangeSet): LineRangeSet {
+		if (this._normalizedRanges.length === 0) {
+			return other;
+		}
+		if (other._normalizedRanges.length === 0) {
+			return this;
+		}
+
+		const result: LineRange[] = [];
+		let i1 = 0;
+		let i2 = 0;
+		let current: LineRange | null = null;
+		while (i1 < this._normalizedRanges.length || i2 < other._normalizedRanges.length) {
+			let next: LineRange | null = null;
+			if (i1 < this._normalizedRanges.length && i2 < other._normalizedRanges.length) {
+				const lineRange1 = this._normalizedRanges[i1];
+				const lineRange2 = other._normalizedRanges[i2];
+				if (lineRange1.startLineNumber < lineRange2.startLineNumber) {
+					next = lineRange1;
+					i1++;
+				} else {
+					next = lineRange2;
+					i2++;
+				}
+			} else if (i1 < this._normalizedRanges.length) {
+				next = this._normalizedRanges[i1];
+				i1++;
+			} else {
+				next = other._normalizedRanges[i2];
+				i2++;
+			}
+
+			if (current === null) {
+				current = next;
+			} else {
+				if (current.endLineNumberExclusive >= next.startLineNumber) {
+					// merge
+					current = new LineRange(current.startLineNumber, Math.max(current.endLineNumberExclusive, next.endLineNumberExclusive));
+				} else {
+					// push
+					result.push(current);
+					current = next;
+				}
+			}
+		}
+		if (current !== null) {
+			result.push(current);
+		}
+		return new LineRangeSet(result);
+	}
+
+	/**
+	 * Subtracts all ranges in this set from `range` and returns the result.
+	 */
+	subtractFrom(range: LineRange): LineRangeSet {
+		// idx of first element that touches range or that is after range
+		const joinRangeStartIdx = findFirstIdxMonotonousOrArrLen(this._normalizedRanges, r => r.endLineNumberExclusive >= range.startLineNumber);
+		// idx of element after { last element that touches range or that is before range }
+		const joinRangeEndIdxExclusive = findLastIdxMonotonous(this._normalizedRanges, r => r.startLineNumber <= range.endLineNumberExclusive) + 1;
+
+		if (joinRangeStartIdx === joinRangeEndIdxExclusive) {
+			return new LineRangeSet([range]);
+		}
+
+		const result: LineRange[] = [];
+		let startLineNumber = range.startLineNumber;
+		for (let i = joinRangeStartIdx; i < joinRangeEndIdxExclusive; i++) {
+			const r = this._normalizedRanges[i];
+			if (r.startLineNumber > startLineNumber) {
+				result.push(new LineRange(startLineNumber, r.startLineNumber));
+			}
+			startLineNumber = r.endLineNumberExclusive;
+		}
+		if (startLineNumber < range.endLineNumberExclusive) {
+			result.push(new LineRange(startLineNumber, range.endLineNumberExclusive));
+		}
+
+		return new LineRangeSet(result);
+	}
+
+	toString() {
+		return this._normalizedRanges.map(r => r.toString()).join(', ');
+	}
+
+	getIntersection(other: LineRangeSet): LineRangeSet {
+		const result: LineRange[] = [];
+
+		let i1 = 0;
+		let i2 = 0;
+		while (i1 < this._normalizedRanges.length && i2 < other._normalizedRanges.length) {
+			const r1 = this._normalizedRanges[i1];
+			const r2 = other._normalizedRanges[i2];
+
+			const i = r1.intersect(r2);
+			if (i && !i.isEmpty) {
+				result.push(i);
+			}
+
+			if (r1.endLineNumberExclusive < r2.endLineNumberExclusive) {
+				i1++;
+			} else {
+				i2++;
+			}
+		}
+
+		return new LineRangeSet(result);
+	}
+
+	getWithDelta(value: number): LineRangeSet {
+		return new LineRangeSet(this._normalizedRanges.map(r => r.delta(value)));
+	}
+}
diff --git a/src/vs/editor/common/core/offsetRange.ts b/src/vs/editor/common/core/offsetRange.ts
index 27e60bca2df..9173e5339bb 100644
--- a/src/vs/editor/common/core/offsetRange.ts
+++ b/src/vs/editor/common/core/offsetRange.ts
@@ -136,6 +136,14 @@ export class OffsetRange {
 		}
 		return value;
 	}
+
+	public map<T>(f: (offset: number) => T): T[] {
+		const result: T[] = [];
+		for (let i = this.start; i < this.endExclusive; i++) {
+			result.push(f(i));
+		}
+		return result;
+	}
 }
 
 export class OffsetRangeSet {
diff --git a/src/vs/editor/common/diff/advancedLinesDiffComputer.ts b/src/vs/editor/common/diff/advancedLinesDiffComputer.ts
index 55166f1ad82..8720d8524ba 100644
--- a/src/vs/editor/common/diff/advancedLinesDiffComputer.ts
+++ b/src/vs/editor/common/diff/advancedLinesDiffComputer.ts
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Comparator, CompareResult, compareBy, equals, findLastIndex, numberComparator, reverseOrder } from 'vs/base/common/arrays';
+import { compareBy, equals, groupAdjacentBy, numberComparator, pushMany, reverseOrder } from 'vs/base/common/arrays';
 import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
 import { CharCode } from 'vs/base/common/charCode';
 import { SetMap } from 'vs/base/common/collections';
-import { BugIndicatingError } from 'vs/base/common/errors';
-import { LineRange } from 'vs/editor/common/core/lineRange';
+import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
@@ -16,7 +15,9 @@ import { DateTimeout, ISequence, ITimeout, InfiniteTimeout, SequenceDiff } from
 import { DynamicProgrammingDiffing } from 'vs/editor/common/diff/algorithms/dynamicProgrammingDiffing';
 import { optimizeSequenceDiffs, removeRandomLineMatches, removeRandomMatches, smoothenSequenceDiffs } from 'vs/editor/common/diff/algorithms/joinSequenceDiffs';
 import { MyersDiffAlgorithm } from 'vs/editor/common/diff/algorithms/myersDiffAlgorithm';
-import { ILinesDiffComputer, ILinesDiffComputerOptions, LineRangeMapping, LinesDiff, MovedText, RangeMapping, SimpleLineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { ILinesDiffComputer, ILinesDiffComputerOptions, LinesDiff, MovedText } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping, LineRangeMapping, RangeMapping } from './rangeMapping';
+import { MonotonousArray, findLastIdxMonotonous, findLastMonotonous, findFirstMonotonous } from 'vs/base/common/arraysFind';
 
 export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 	private readonly dynamicProgrammingDiffing = new DynamicProgrammingDiffing();
@@ -29,7 +30,7 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 
 		if (originalLines.length === 1 && originalLines[0].length === 0 || modifiedLines.length === 1 && modifiedLines[0].length === 0) {
 			return new LinesDiff([
-				new LineRangeMapping(
+				new DetailedLineRangeMapping(
 					new LineRange(1, originalLines.length + 1),
 					new LineRange(1, modifiedLines.length + 1),
 					[
@@ -167,7 +168,7 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 						validatePosition(ic.originalRange.getStartPosition(), originalLines) && validatePosition(ic.originalRange.getEndPosition(), originalLines);
 					if (!valid) { return false; }
 				}
-				if (!validateRange(c.modifiedRange, modifiedLines) || !validateRange(c.originalRange, originalLines)) {
+				if (!validateRange(c.modified, modifiedLines) || !validateRange(c.original, originalLines)) {
 					return false;
 				}
 			}
@@ -177,16 +178,94 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 		return new LinesDiff(changes, moves, hitTimeout);
 	}
 
-	private computeMoves(changes: LineRangeMapping[], originalLines: string[], modifiedLines: string[], hashedOriginalLines: number[], hashedModifiedLines: number[], timeout: ITimeout, considerWhitespaceChanges: boolean): MovedText[] {
-		const moves: SimpleLineRangeMapping[] = [];
-		const deletions = changes
-			.filter(c => c.modifiedRange.isEmpty && c.originalRange.length >= 3)
-			.map(d => new LineRangeFragment(d.originalRange, originalLines, d));
-		const insertions = new Set(changes
-			.filter(c => c.originalRange.isEmpty && c.modifiedRange.length >= 3)
-			.map(d => new LineRangeFragment(d.modifiedRange, modifiedLines, d)));
+	private computeMoves(
+		changes: DetailedLineRangeMapping[],
+		originalLines: string[],
+		modifiedLines: string[],
+		hashedOriginalLines: number[],
+		hashedModifiedLines: number[],
+		timeout: ITimeout,
+		considerWhitespaceChanges: boolean,
+	): MovedText[] {
+		const { moves, excludedChanges } = this.computeMovesFromSimpleDeletionsToSimpleInsertions(changes, originalLines, modifiedLines, timeout);
 
-		const excludedChanges = new Set<LineRangeMapping>();
+		if (!timeout.isValid()) { return []; }
+
+		const unchangedMoves = this.computeUnchangedMoves(
+			changes.filter(c => !excludedChanges.has(c)),
+			hashedOriginalLines,
+			hashedModifiedLines,
+			timeout
+		);
+		pushMany(moves, unchangedMoves);
+
+		// join moves
+		moves.sort(compareBy(m => m.original.startLineNumber, numberComparator));
+		if (moves.length === 0) {
+			return [];
+		}
+		let joinedMoves = [moves[0]];
+		for (let i = 1; i < moves.length; i++) {
+			const last = joinedMoves[joinedMoves.length - 1];
+			const current = moves[i];
+
+			const originalDist = current.original.startLineNumber - last.original.endLineNumberExclusive;
+			const modifiedDist = current.modified.startLineNumber - last.modified.endLineNumberExclusive;
+			const currentMoveAfterLast = originalDist >= 0 && modifiedDist >= 0;
+
+			if (currentMoveAfterLast && originalDist + modifiedDist <= 2) {
+				joinedMoves[joinedMoves.length - 1] = last.join(current);
+				continue;
+			}
+
+			const originalText = current.original.toOffsetRange().slice(originalLines).map(l => l.trim()).join('\n');
+			if (originalText.length <= 10) {
+				// Ignore small moves
+				continue;
+			}
+			joinedMoves.push(current);
+		}
+
+		// Ignore non moves
+		const changesMonotonous = new MonotonousArray(changes);
+		joinedMoves = joinedMoves.filter(m => {
+			const diffBeforeOriginalMove = changesMonotonous.findLastMonotonous(c => c.original.endLineNumberExclusive <= m.original.startLineNumber)
+				|| new LineRangeMapping(new LineRange(1, 1), new LineRange(1, 1));
+
+			const modifiedDistToPrevDiff = m.modified.startLineNumber - diffBeforeOriginalMove.modified.endLineNumberExclusive;
+			const originalDistToPrevDiff = m.original.startLineNumber - diffBeforeOriginalMove.original.endLineNumberExclusive;
+
+			const differentDistances = modifiedDistToPrevDiff !== originalDistToPrevDiff;
+			return differentDistances;
+		});
+
+		const movesWithDiffs = joinedMoves.map(m => {
+			const moveChanges = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(
+				m.original.toOffsetRange(),
+				m.modified.toOffsetRange(),
+			), timeout, considerWhitespaceChanges);
+			const mappings = lineRangeMappingFromRangeMappings(moveChanges.mappings, originalLines, modifiedLines, true);
+			return new MovedText(m, mappings);
+		});
+		return movesWithDiffs;
+	}
+
+	private computeMovesFromSimpleDeletionsToSimpleInsertions(
+		changes: DetailedLineRangeMapping[],
+		originalLines: string[],
+		modifiedLines: string[],
+		timeout: ITimeout,
+	) {
+		const moves: LineRangeMapping[] = [];
+
+		const deletions = changes
+			.filter(c => c.modified.isEmpty && c.original.length >= 3)
+			.map(d => new LineRangeFragment(d.original, originalLines, d));
+		const insertions = new Set(changes
+			.filter(c => c.original.isEmpty && c.modified.length >= 3)
+			.map(d => new LineRangeFragment(d.modified, modifiedLines, d)));
+
+		const excludedChanges = new Set<DetailedLineRangeMapping>();
 
 		for (const deletion of deletions) {
 			let highestSimilarity = -1;
@@ -201,24 +280,31 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 
 			if (highestSimilarity > 0.90 && best) {
 				insertions.delete(best);
-				moves.push(new SimpleLineRangeMapping(deletion.range, best.range));
+				moves.push(new LineRangeMapping(deletion.range, best.range));
 				excludedChanges.add(deletion.source);
 				excludedChanges.add(best.source);
 			}
 
 			if (!timeout.isValid()) {
-				return [];
+				return { moves, excludedChanges };
 			}
 		}
 
+		return { moves, excludedChanges };
+	}
+
+	private computeUnchangedMoves(
+		changes: DetailedLineRangeMapping[],
+		hashedOriginalLines: number[],
+		hashedModifiedLines: number[],
+		timeout: ITimeout,
+	) {
+		const moves: LineRangeMapping[] = [];
+
 		const original3LineHashes = new SetMap<string, { range: LineRange }>();
 
 		for (const change of changes) {
-			if (excludedChanges.has(change)) {
-				continue;
-			}
-
-			for (let i = change.originalRange.startLineNumber; i < change.originalRange.endLineNumberExclusive - 2; i++) {
+			for (let i = change.original.startLineNumber; i < change.original.endLineNumberExclusive - 2; i++) {
 				const key = `${hashedOriginalLines[i - 1]}:${hashedOriginalLines[i + 1 - 1]}:${hashedOriginalLines[i + 2 - 1]}`;
 				original3LineHashes.add(key, { range: new LineRange(i, i + 3) });
 			}
@@ -231,15 +317,11 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 
 		const possibleMappings: PossibleMapping[] = [];
 
-		changes.sort(compareBy(c => c.modifiedRange.startLineNumber, numberComparator));
+		changes.sort(compareBy(c => c.modified.startLineNumber, numberComparator));
 
 		for (const change of changes) {
-			if (excludedChanges.has(change)) {
-				continue;
-			}
-
 			let lastMappings: PossibleMapping[] = [];
-			for (let i = change.modifiedRange.startLineNumber; i < change.modifiedRange.endLineNumberExclusive - 2; i++) {
+			for (let i = change.modified.startLineNumber; i < change.modified.endLineNumberExclusive - 2; i++) {
 				const key = `${hashedModifiedLines[i - 1]}:${hashedModifiedLines[i + 1 - 1]}:${hashedModifiedLines[i + 2 - 1]}`;
 				const currentModifiedRange = new LineRange(i, i + 3);
 
@@ -280,73 +362,25 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 
 			const diffOrigToMod = mapping.modifiedLineRange.startLineNumber - mapping.originalLineRange.startLineNumber;
 			const modifiedSections = modifiedSet.subtractFrom(mapping.modifiedLineRange);
-			const originalTranslatedSections = originalSet.subtractFrom(mapping.originalLineRange).map(r => r.delta(diffOrigToMod));
+			const originalTranslatedSections = originalSet.subtractFrom(mapping.originalLineRange).getWithDelta(diffOrigToMod);
 
-			const modifiedIntersectedSections = intersectRanges(modifiedSections, originalTranslatedSections);
+			const modifiedIntersectedSections = modifiedSections.getIntersection(originalTranslatedSections);
 
-			for (const s of modifiedIntersectedSections) {
+			for (const s of modifiedIntersectedSections.ranges) {
 				if (s.length < 3) {
 					continue;
 				}
 				const modifiedLineRange = s;
 				const originalLineRange = s.delta(-diffOrigToMod);
 
-				moves.push(new SimpleLineRangeMapping(originalLineRange, modifiedLineRange));
+				moves.push(new LineRangeMapping(originalLineRange, modifiedLineRange));
 
 				modifiedSet.addRange(modifiedLineRange);
 				originalSet.addRange(originalLineRange);
 			}
 		}
 
-		// join moves
-		moves.sort(compareBy(m => m.original.startLineNumber, numberComparator));
-		if (moves.length === 0) {
-			return [];
-		}
-		let joinedMoves = [moves[0]];
-		for (let i = 1; i < moves.length; i++) {
-			const last = joinedMoves[joinedMoves.length - 1];
-			const current = moves[i];
-
-			const originalDist = current.original.startLineNumber - last.original.endLineNumberExclusive;
-			const modifiedDist = current.modified.startLineNumber - last.modified.endLineNumberExclusive;
-			const currentMoveAfterLast = originalDist >= 0 && modifiedDist >= 0;
-
-			if (currentMoveAfterLast && originalDist + modifiedDist <= 2) {
-				joinedMoves[joinedMoves.length - 1] = last.join(current);
-				continue;
-			}
-
-			const originalText = current.original.toOffsetRange().slice(originalLines).map(l => l.trim()).join('\n');
-			if (originalText.length <= 10) {
-				// Ignore small moves
-				continue;
-			}
-			joinedMoves.push(current);
-		}
-
-		// Ignore non moves
-		const originalChanges = MonotonousFinder.createOfSorted(changes, c => c.originalRange.endLineNumberExclusive, numberComparator);
-		joinedMoves = joinedMoves.filter(m => {
-			const diffBeforeOriginalMove = originalChanges.findLastItemBeforeOrEqual(m.original.startLineNumber)
-				|| new LineRangeMapping(new LineRange(1, 1), new LineRange(1, 1), []);
-
-			const modifiedDistToPrevDiff = m.modified.startLineNumber - diffBeforeOriginalMove.modifiedRange.endLineNumberExclusive;
-			const originalDistToPrevDiff = m.original.startLineNumber - diffBeforeOriginalMove.originalRange.endLineNumberExclusive;
-
-			const differentDistances = modifiedDistToPrevDiff !== originalDistToPrevDiff;
-			return differentDistances;
-		});
-
-		const fullMoves = joinedMoves.map(m => {
-			const moveChanges = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(
-				m.original.toOffsetRange(),
-				m.modified.toOffsetRange(),
-			), timeout, considerWhitespaceChanges);
-			const mappings = lineRangeMappingFromRangeMappings(moveChanges.mappings, originalLines, modifiedLines, true);
-			return new MovedText(m, mappings);
-		});
-		return fullMoves;
+		return moves;
 	}
 
 	private refineDiff(originalLines: string[], modifiedLines: string[], diff: SequenceDiff, timeout: ITimeout, considerWhitespaceChanges: boolean): { mappings: RangeMapping[]; hitTimeout: boolean } {
@@ -380,154 +414,6 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 	}
 }
 
-class MonotonousFinder<TItem, TDomain> {
-	public static create<TItem, TDomain>(
-		items: TItem[],
-		itemToDomain: (item: TItem) => TDomain,
-		domainComparator: Comparator<TDomain>,
-	): MonotonousFinder<TItem, TDomain> {
-		items.sort((a, b) => domainComparator(itemToDomain(a), itemToDomain(b)));
-		return new MonotonousFinder(items, itemToDomain, domainComparator);
-	}
-
-	public static createOfSorted<TItem, TDomain>(
-		items: TItem[],
-		itemToDomain: (item: TItem) => TDomain,
-		domainComparator: Comparator<TDomain>,
-	): MonotonousFinder<TItem, TDomain> {
-		return new MonotonousFinder(items, itemToDomain, domainComparator);
-	}
-
-	private _currentIdx = 0; // All values with index lower than this are smaller than or equal to _lastValue and vice versa.
-	private _lastValue: TDomain | undefined = undefined; // Represents a smallest value.
-	private _hasLastValue = false;
-
-	private constructor(
-		private readonly _items: TItem[],
-		private readonly _itemToDomain: (item: TItem) => TDomain,
-		private readonly _domainComparator: Comparator<TDomain>,
-	) {
-	}
-
-	/**
-	 * Assumes the values are monotonously increasing.
-	 */
-	findLastItemBeforeOrEqual(value: TDomain): TItem | undefined {
-		if (this._hasLastValue && CompareResult.isLessThan(this._domainComparator(value, this._lastValue!))) {
-			// Values must be monotonously increasing
-			throw new BugIndicatingError();
-		}
-		this._lastValue = value;
-		this._hasLastValue = true;
-
-		while (
-			this._currentIdx < this._items.length
-			&& CompareResult.isLessThanOrEqual(this._domainComparator(
-				this._itemToDomain(this._items[this._currentIdx]),
-				value
-			))
-		) {
-			this._currentIdx++;
-		}
-
-		return this._currentIdx === 0 ? undefined : this._items[this._currentIdx - 1];
-	}
-}
-
-function intersectRanges(ranges1: LineRange[], ranges2: LineRange[]): LineRange[] {
-	const result: LineRange[] = [];
-
-	let i1 = 0;
-	let i2 = 0;
-	while (i1 < ranges1.length && i2 < ranges2.length) {
-		const r1 = ranges1[i1];
-		const r2 = ranges2[i2];
-
-		const i = r1.intersect(r2);
-		if (i && !i.isEmpty) {
-			result.push(i);
-		}
-
-		if (r1.endLineNumberExclusive < r2.endLineNumberExclusive) {
-			i1++;
-		} else {
-			i2++;
-		}
-	}
-
-	return result;
-}
-
-// TODO make this fast
-class LineRangeSet {
-	private readonly _normalizedRanges: LineRange[] = [];
-
-	addRange(range: LineRange): void {
-		// Idea: Find joinRange such that:
-		// replaceRange = _normalizedRanges.replaceRange(joinRange, range.joinAll(joinRange.map(idx => this._normalizedRanges[idx])))
-
-		// idx of first element that touches range or that is after range
-		const joinRangeStartIdx = mapMinusOne(this._normalizedRanges.findIndex(r => r.endLineNumberExclusive >= range.startLineNumber), this._normalizedRanges.length);
-		// idx of element after { last element that touches range or that is before range }
-		const joinRangeEndIdxExclusive = findLastIndex(this._normalizedRanges, r => r.startLineNumber <= range.endLineNumberExclusive) + 1;
-
-		if (joinRangeStartIdx === joinRangeEndIdxExclusive) {
-			// If there is no element that touches range, then joinRangeStartIdx === joinRangeEndIdxExclusive and that value is the index of the element after range
-			this._normalizedRanges.splice(joinRangeStartIdx, 0, range);
-		} else if (joinRangeStartIdx === joinRangeEndIdxExclusive - 1) {
-			// Else, there is an element that touches range and in this case it is both the first and last element. Thus we can replace it
-			const joinRange = this._normalizedRanges[joinRangeStartIdx];
-			this._normalizedRanges[joinRangeStartIdx] = joinRange.join(range);
-		} else {
-			// First and last element are different - we need to replace the entire range
-			const joinRange = this._normalizedRanges[joinRangeStartIdx].join(this._normalizedRanges[joinRangeEndIdxExclusive - 1]).join(range);
-			this._normalizedRanges.splice(joinRangeStartIdx, joinRangeEndIdxExclusive - joinRangeStartIdx, joinRange);
-		}
-	}
-
-	intersects(range: LineRange): boolean {
-		for (const r of this._normalizedRanges) {
-			if (r.intersectsStrict(range)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Subtracts all ranges in this set from `range` and returns the result.
-	 */
-	subtractFrom(range: LineRange): LineRange[] {
-		// idx of first element that touches range or that is after range
-		const joinRangeStartIdx = mapMinusOne(this._normalizedRanges.findIndex(r => r.endLineNumberExclusive >= range.startLineNumber), this._normalizedRanges.length);
-		// idx of element after { last element that touches range or that is before range }
-		const joinRangeEndIdxExclusive = findLastIndex(this._normalizedRanges, r => r.startLineNumber <= range.endLineNumberExclusive) + 1;
-
-		if (joinRangeStartIdx === joinRangeEndIdxExclusive) {
-			return [range];
-		}
-
-		const result: LineRange[] = [];
-		let startLineNumber = range.startLineNumber;
-		for (let i = joinRangeStartIdx; i < joinRangeEndIdxExclusive; i++) {
-			const r = this._normalizedRanges[i];
-			if (r.startLineNumber > startLineNumber) {
-				result.push(new LineRange(startLineNumber, r.startLineNumber));
-			}
-			startLineNumber = r.endLineNumberExclusive;
-		}
-		if (startLineNumber < range.endLineNumberExclusive) {
-			result.push(new LineRange(startLineNumber, range.endLineNumberExclusive));
-		}
-
-		return result;
-	}
-}
-
-function mapMinusOne(idx: number, mapTo: number): number {
-	return idx === -1 ? mapTo : idx;
-}
-
 function coverFullWords(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
 	const additional: SequenceDiff[] = [];
 
@@ -623,42 +509,42 @@ function mergeSequenceDiffs(sequenceDiffs1: SequenceDiff[], sequenceDiffs2: Sequ
 	return result;
 }
 
-export function lineRangeMappingFromRangeMappings(alignments: RangeMapping[], originalLines: string[], modifiedLines: string[], dontAssertStartLine: boolean = false): LineRangeMapping[] {
-	const changes: LineRangeMapping[] = [];
-	for (const g of group(
+export function lineRangeMappingFromRangeMappings(alignments: RangeMapping[], originalLines: string[], modifiedLines: string[], dontAssertStartLine: boolean = false): DetailedLineRangeMapping[] {
+	const changes: DetailedLineRangeMapping[] = [];
+	for (const g of groupAdjacentBy(
 		alignments.map(a => getLineRangeMapping(a, originalLines, modifiedLines)),
 		(a1, a2) =>
-			a1.originalRange.overlapOrTouch(a2.originalRange)
-			|| a1.modifiedRange.overlapOrTouch(a2.modifiedRange)
+			a1.original.overlapOrTouch(a2.original)
+			|| a1.modified.overlapOrTouch(a2.modified)
 	)) {
 		const first = g[0];
 		const last = g[g.length - 1];
 
-		changes.push(new LineRangeMapping(
-			first.originalRange.join(last.originalRange),
-			first.modifiedRange.join(last.modifiedRange),
+		changes.push(new DetailedLineRangeMapping(
+			first.original.join(last.original),
+			first.modified.join(last.modified),
 			g.map(a => a.innerChanges![0]),
 		));
 	}
 
 	assertFn(() => {
 		if (!dontAssertStartLine) {
-			if (changes.length > 0 && changes[0].originalRange.startLineNumber !== changes[0].modifiedRange.startLineNumber) {
+			if (changes.length > 0 && changes[0].original.startLineNumber !== changes[0].modified.startLineNumber) {
 				return false;
 			}
 		}
 		return checkAdjacentItems(changes,
-			(m1, m2) => m2.originalRange.startLineNumber - m1.originalRange.endLineNumberExclusive === m2.modifiedRange.startLineNumber - m1.modifiedRange.endLineNumberExclusive &&
+			(m1, m2) => m2.original.startLineNumber - m1.original.endLineNumberExclusive === m2.modified.startLineNumber - m1.modified.endLineNumberExclusive &&
 				// There has to be an unchanged line in between (otherwise both diffs should have been joined)
-				m1.originalRange.endLineNumberExclusive < m2.originalRange.startLineNumber &&
-				m1.modifiedRange.endLineNumberExclusive < m2.modifiedRange.startLineNumber,
+				m1.original.endLineNumberExclusive < m2.original.startLineNumber &&
+				m1.modified.endLineNumberExclusive < m2.modified.startLineNumber,
 		);
 	});
 
 	return changes;
 }
 
-export function getLineRangeMapping(rangeMapping: RangeMapping, originalLines: string[], modifiedLines: string[]): LineRangeMapping {
+export function getLineRangeMapping(rangeMapping: RangeMapping, originalLines: string[], modifiedLines: string[]): DetailedLineRangeMapping {
 	let lineStartDelta = 0;
 	let lineEndDelta = 0;
 
@@ -692,26 +578,7 @@ export function getLineRangeMapping(rangeMapping: RangeMapping, originalLines: s
 		rangeMapping.modifiedRange.endLineNumber + 1 + lineEndDelta
 	);
 
-	return new LineRangeMapping(originalLineRange, modifiedLineRange, [rangeMapping]);
-}
-
-function* group<T>(items: Iterable<T>, shouldBeGrouped: (item1: T, item2: T) => boolean): Iterable<T[]> {
-	let currentGroup: T[] | undefined;
-	let last: T | undefined;
-	for (const item of items) {
-		if (last !== undefined && shouldBeGrouped(last, item)) {
-			currentGroup!.push(item);
-		} else {
-			if (currentGroup) {
-				yield currentGroup;
-			}
-			currentGroup = [item];
-		}
-		last = item;
-	}
-	if (currentGroup) {
-		yield currentGroup;
-	}
+	return new DetailedLineRangeMapping(originalLineRange, modifiedLineRange, [rangeMapping]);
 }
 
 export class LineSequence implements ISequence {
@@ -753,7 +620,7 @@ function getIndentation(str: string): number {
 
 export class LinesSliceCharSequence implements ISequence {
 	private readonly elements: number[] = [];
-	private readonly firstCharOffsetByLineMinusOne: number[] = [];
+	private readonly firstCharOffsetByLine: number[] = [];
 	public readonly lineRange: OffsetRange;
 	// To account for trimming
 	private readonly additionalOffsetByLine: number[] = [];
@@ -771,6 +638,7 @@ export class LinesSliceCharSequence implements ISequence {
 
 		this.lineRange = lineRange;
 
+		this.firstCharOffsetByLine[0] = 0;
 		for (let i = this.lineRange.start; i < this.lineRange.endExclusive; i++) {
 			let line = lines[i];
 			let offset = 0;
@@ -793,7 +661,7 @@ export class LinesSliceCharSequence implements ISequence {
 			// Don't add an \n that does not exist in the document.
 			if (i < lines.length - 1) {
 				this.elements.push('\n'.charCodeAt(0));
-				this.firstCharOffsetByLineMinusOne[i - this.lineRange.start] = this.elements.length;
+				this.firstCharOffsetByLine[i - this.lineRange.start + 1] = this.elements.length;
 			}
 		}
 		// To account for the last line
@@ -852,19 +720,8 @@ export class LinesSliceCharSequence implements ISequence {
 			return new Position(this.lineRange.start + 1, 1);
 		}
 
-		let i = 0;
-		let j = this.firstCharOffsetByLineMinusOne.length;
-		while (i < j) {
-			const k = Math.floor((i + j) / 2);
-			if (this.firstCharOffsetByLineMinusOne[k] > offset) {
-				j = k;
-			} else {
-				i = k + 1;
-			}
-		}
-
-		const offsetOfFirstCharInLine = i === 0 ? 0 : this.firstCharOffsetByLineMinusOne[i - 1];
-		return new Position(this.lineRange.start + i + 1, offset - offsetOfFirstCharInLine + 1 + this.additionalOffsetByLine[i]);
+		const i = findLastIdxMonotonous(this.firstCharOffsetByLine, (value) => value <= offset);
+		return new Position(this.lineRange.start + i + 1, offset - this.firstCharOffsetByLine[i] + this.additionalOffsetByLine[i] + 1);
 	}
 
 	public translateRange(range: OffsetRange): Range {
@@ -907,60 +764,12 @@ export class LinesSliceCharSequence implements ISequence {
 	}
 
 	public extendToFullLines(range: OffsetRange): OffsetRange {
-		const start = findLastMonotonous(this.firstCharOffsetByLineMinusOne, x => x <= range.start) ?? 0;
-		const end = findFirstMonotonous(this.firstCharOffsetByLineMinusOne, x => range.endExclusive <= x) ?? this.elements.length;
+		const start = findLastMonotonous(this.firstCharOffsetByLine, x => x <= range.start) ?? 0;
+		const end = findFirstMonotonous(this.firstCharOffsetByLine, x => range.endExclusive <= x) ?? this.elements.length;
 		return new OffsetRange(start, end);
 	}
 }
 
-/**
- * `arr.map(predicate)` must be like `[true, ..., true, false, ..., false]`!
- *
- * @returns -1 if predicate is false for all items
- */
-function findLastIdxMonotonous<T>(arr: T[], predicate: (item: T) => boolean): number {
-	let i = 0;
-	let j = arr.length;
-	while (i < j) {
-		const k = Math.floor((i + j) / 2);
-		if (predicate(arr[k])) {
-			i = k + 1;
-		} else {
-			j = k;
-		}
-	}
-	return i - 1;
-}
-
-export function findLastMonotonous<T>(arr: T[], predicate: (item: T) => boolean): T | undefined {
-	const idx = findLastIdxMonotonous(arr, predicate);
-	return idx === -1 ? undefined : arr[idx];
-}
-
-/**
- * `arr.map(predicate)` must be like `[false, ..., false, true, ..., true]`!
- *
- * @returns arr.length if predicate is false for all items
- */
-function findFirstIdxMonotonous<T>(arr: T[], predicate: (item: T) => boolean): number {
-	let i = 0;
-	let j = arr.length;
-	while (i < j) {
-		const k = Math.floor((i + j) / 2);
-		if (predicate(arr[k])) {
-			j = k;
-		} else {
-			i = k + 1;
-		}
-	}
-	return i;
-}
-
-export function findFirstMonotonous<T>(arr: T[], predicate: (item: T) => boolean): T | undefined {
-	const idx = findFirstIdxMonotonous(arr, predicate);
-	return idx === arr.length ? undefined : arr[idx];
-}
-
 function isWordChar(charCode: number): boolean {
 	return charCode >= CharCode.a && charCode <= CharCode.z
 		|| charCode >= CharCode.A && charCode <= CharCode.Z
@@ -1033,7 +842,7 @@ class LineRangeFragment {
 	constructor(
 		public readonly range: LineRange,
 		public readonly lines: string[],
-		public readonly source: LineRangeMapping,
+		public readonly source: DetailedLineRangeMapping,
 	) {
 		let counter = 0;
 		for (let i = range.startLineNumber - 1; i < range.endLineNumberExclusive - 1; i++) {
diff --git a/src/vs/editor/common/diff/documentDiffProvider.ts b/src/vs/editor/common/diff/documentDiffProvider.ts
index 02907dddca3..44accf9e604 100644
--- a/src/vs/editor/common/diff/documentDiffProvider.ts
+++ b/src/vs/editor/common/diff/documentDiffProvider.ts
@@ -5,7 +5,8 @@
 
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Event } from 'vs/base/common/event';
-import { LineRangeMapping, MovedText } from 'vs/editor/common/diff/linesDiffComputer';
+import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from './rangeMapping';
 import { ITextModel } from 'vs/editor/common/model';
 
 /**
@@ -61,7 +62,7 @@ export interface IDocumentDiff {
 	/**
 	 * Maps all modified line ranges in the original to the corresponding line ranges in the modified text model.
 	 */
-	readonly changes: readonly LineRangeMapping[];
+	readonly changes: readonly DetailedLineRangeMapping[];
 
 	/**
 	 * Sorted by original line ranges.
diff --git a/src/vs/editor/common/diff/legacyLinesDiffComputer.ts b/src/vs/editor/common/diff/legacyLinesDiffComputer.ts
index 5ea6524a41e..8d7e05e0308 100644
--- a/src/vs/editor/common/diff/legacyLinesDiffComputer.ts
+++ b/src/vs/editor/common/diff/legacyLinesDiffComputer.ts
@@ -5,7 +5,8 @@
 
 import { CharCode } from 'vs/base/common/charCode';
 import { IDiffChange, ISequence, LcsDiff, IDiffResult } from 'vs/base/common/diff/diff';
-import { ILinesDiffComputer, ILinesDiffComputerOptions, RangeMapping, LineRangeMapping, LinesDiff } from 'vs/editor/common/diff/linesDiffComputer';
+import { ILinesDiffComputer, ILinesDiffComputerOptions, LinesDiff } from 'vs/editor/common/diff/linesDiffComputer';
+import { RangeMapping, DetailedLineRangeMapping } from './rangeMapping';
 import * as strings from 'vs/base/common/strings';
 import { Range } from 'vs/editor/common/core/range';
 import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
@@ -23,8 +24,8 @@ export class LegacyLinesDiffComputer implements ILinesDiffComputer {
 			shouldPostProcessCharChanges: true,
 		});
 		const result = diffComputer.computeDiff();
-		const changes: LineRangeMapping[] = [];
-		let lastChange: LineRangeMapping | null = null;
+		const changes: DetailedLineRangeMapping[] = [];
+		let lastChange: DetailedLineRangeMapping | null = null;
 
 
 		for (const c of result.changes) {
@@ -44,17 +45,17 @@ export class LegacyLinesDiffComputer implements ILinesDiffComputer {
 				modifiedRange = new LineRange(c.modifiedStartLineNumber, c.modifiedEndLineNumber + 1);
 			}
 
-			let change = new LineRangeMapping(originalRange, modifiedRange, c.charChanges?.map(c => new RangeMapping(
+			let change = new DetailedLineRangeMapping(originalRange, modifiedRange, c.charChanges?.map(c => new RangeMapping(
 				new Range(c.originalStartLineNumber, c.originalStartColumn, c.originalEndLineNumber, c.originalEndColumn),
 				new Range(c.modifiedStartLineNumber, c.modifiedStartColumn, c.modifiedEndLineNumber, c.modifiedEndColumn),
 			)));
 			if (lastChange) {
-				if (lastChange.modifiedRange.endLineNumberExclusive === change.modifiedRange.startLineNumber
-					|| lastChange.originalRange.endLineNumberExclusive === change.originalRange.startLineNumber) {
+				if (lastChange.modified.endLineNumberExclusive === change.modified.startLineNumber
+					|| lastChange.original.endLineNumberExclusive === change.original.startLineNumber) {
 					// join touching diffs. Probably moving diffs up/down in the algorithm causes touching diffs.
-					change = new LineRangeMapping(
-						lastChange.originalRange.join(change.originalRange),
-						lastChange.modifiedRange.join(change.modifiedRange),
+					change = new DetailedLineRangeMapping(
+						lastChange.original.join(change.original),
+						lastChange.modified.join(change.modified),
 						lastChange.innerChanges && change.innerChanges ?
 							lastChange.innerChanges.concat(change.innerChanges) : undefined
 					);
@@ -68,10 +69,10 @@ export class LegacyLinesDiffComputer implements ILinesDiffComputer {
 
 		assertFn(() => {
 			return checkAdjacentItems(changes,
-				(m1, m2) => m2.originalRange.startLineNumber - m1.originalRange.endLineNumberExclusive === m2.modifiedRange.startLineNumber - m1.modifiedRange.endLineNumberExclusive &&
+				(m1, m2) => m2.original.startLineNumber - m1.original.endLineNumberExclusive === m2.modified.startLineNumber - m1.modified.endLineNumberExclusive &&
 					// There has to be an unchanged line in between (otherwise both diffs should have been joined)
-					m1.originalRange.endLineNumberExclusive < m2.originalRange.startLineNumber &&
-					m1.modifiedRange.endLineNumberExclusive < m2.modifiedRange.startLineNumber,
+					m1.original.endLineNumberExclusive < m2.original.startLineNumber &&
+					m1.modified.endLineNumberExclusive < m2.modified.startLineNumber,
 			);
 		});
 
@@ -92,7 +93,7 @@ export interface IDiffComputationResult {
 	/**
 	 * The changes as (modern) line range mapping array.
 	 */
-	changes2: readonly LineRangeMapping[];
+	changes2: readonly DetailedLineRangeMapping[];
 }
 
 /**
diff --git a/src/vs/editor/common/diff/linesDiffComputer.ts b/src/vs/editor/common/diff/linesDiffComputer.ts
index d10888cb93f..a11674f0127 100644
--- a/src/vs/editor/common/diff/linesDiffComputer.ts
+++ b/src/vs/editor/common/diff/linesDiffComputer.ts
@@ -3,8 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { Range } from 'vs/editor/common/core/range';
+import { DetailedLineRangeMapping, LineRangeMapping } from './rangeMapping';
 
 export interface ILinesDiffComputer {
 	computeDiff(originalLines: string[], modifiedLines: string[], options: ILinesDiffComputerOptions): LinesDiff;
@@ -18,7 +17,7 @@ export interface ILinesDiffComputerOptions {
 
 export class LinesDiff {
 	constructor(
-		readonly changes: readonly LineRangeMapping[],
+		readonly changes: readonly DetailedLineRangeMapping[],
 
 		/**
 		 * Sorted by original line ranges.
@@ -35,148 +34,19 @@ export class LinesDiff {
 	}
 }
 
-/**
- * Maps a line range in the original text model to a line range in the modified text model.
- */
-export class LineRangeMapping {
-	public static inverse(mapping: readonly LineRangeMapping[], originalLineCount: number, modifiedLineCount: number): LineRangeMapping[] {
-		const result: LineRangeMapping[] = [];
-		let lastOriginalEndLineNumber = 1;
-		let lastModifiedEndLineNumber = 1;
-
-		for (const m of mapping) {
-			const r = new LineRangeMapping(
-				new LineRange(lastOriginalEndLineNumber, m.originalRange.startLineNumber),
-				new LineRange(lastModifiedEndLineNumber, m.modifiedRange.startLineNumber),
-				undefined
-			);
-			if (!r.modifiedRange.isEmpty) {
-				result.push(r);
-			}
-			lastOriginalEndLineNumber = m.originalRange.endLineNumberExclusive;
-			lastModifiedEndLineNumber = m.modifiedRange.endLineNumberExclusive;
-		}
-		const r = new LineRangeMapping(
-			new LineRange(lastOriginalEndLineNumber, originalLineCount + 1),
-			new LineRange(lastModifiedEndLineNumber, modifiedLineCount + 1),
-			undefined
-		);
-		if (!r.modifiedRange.isEmpty) {
-			result.push(r);
-		}
-		return result;
-	}
-
-	/**
-	 * The line range in the original text model.
-	 */
-	public readonly originalRange: LineRange;
-
-	/**
-	 * The line range in the modified text model.
-	 */
-	public readonly modifiedRange: LineRange;
-
-	/**
-	 * If inner changes have not been computed, this is set to undefined.
-	 * Otherwise, it represents the character-level diff in this line range.
-	 * The original range of each range mapping should be contained in the original line range (same for modified), exceptions are new-lines.
-	 * Must not be an empty array.
-	 */
-	public readonly innerChanges: RangeMapping[] | undefined;
-
-	constructor(
-		originalRange: LineRange,
-		modifiedRange: LineRange,
-		innerChanges: RangeMapping[] | undefined,
-	) {
-		this.originalRange = originalRange;
-		this.modifiedRange = modifiedRange;
-		this.innerChanges = innerChanges;
-	}
-
-	public toString(): string {
-		return `{${this.originalRange.toString()}->${this.modifiedRange.toString()}}`;
-	}
-
-	public get changedLineCount() {
-		return Math.max(this.originalRange.length, this.modifiedRange.length);
-	}
-
-	public flip(): LineRangeMapping {
-		return new LineRangeMapping(this.modifiedRange, this.originalRange, this.innerChanges?.map(c => c.flip()));
-	}
-}
-
-/**
- * Maps a range in the original text model to a range in the modified text model.
- */
-export class RangeMapping {
-	/**
-	 * The original range.
-	 */
-	readonly originalRange: Range;
-
-	/**
-	 * The modified range.
-	 */
-	readonly modifiedRange: Range;
-
-	constructor(
-		originalRange: Range,
-
-		modifiedRange: Range,
-	) {
-		this.originalRange = originalRange;
-		this.modifiedRange = modifiedRange;
-	}
-
-	public toString(): string {
-		return `{${this.originalRange.toString()}->${this.modifiedRange.toString()}}`;
-	}
-
-	public flip(): RangeMapping {
-		return new RangeMapping(this.modifiedRange, this.originalRange);
-	}
-}
-
-// TODO@hediet: Make LineRangeMapping extend from this!
-export class SimpleLineRangeMapping {
-	constructor(
-		public readonly original: LineRange,
-		public readonly modified: LineRange,
-	) {
-	}
-
-	public toString(): string {
-		return `{${this.original.toString()}->${this.modified.toString()}}`;
-	}
-
-	public flip(): SimpleLineRangeMapping {
-		return new SimpleLineRangeMapping(this.modified, this.original);
-	}
-
-	public join(other: SimpleLineRangeMapping): SimpleLineRangeMapping {
-		return new SimpleLineRangeMapping(
-			this.original.join(other.original),
-			this.modified.join(other.modified),
-		);
-	}
-}
-
 export class MovedText {
-	public readonly lineRangeMapping: SimpleLineRangeMapping;
+	public readonly lineRangeMapping: LineRangeMapping;
 
 	/**
 	 * The diff from the original text to the moved text.
 	 * Must be contained in the original/modified line range.
 	 * Can be empty if the text didn't change (only moved).
 	 */
-	public readonly changes: readonly LineRangeMapping[];
+	public readonly changes: readonly DetailedLineRangeMapping[];
 
 	constructor(
-		lineRangeMapping: SimpleLineRangeMapping,
-		changes: readonly LineRangeMapping[],
+		lineRangeMapping: LineRangeMapping,
+		changes: readonly DetailedLineRangeMapping[],
 	) {
 		this.lineRangeMapping = lineRangeMapping;
 		this.changes = changes;
diff --git a/src/vs/editor/common/diff/rangeMapping.ts b/src/vs/editor/common/diff/rangeMapping.ts
new file mode 100644
index 00000000000..12ac2a362e9
--- /dev/null
+++ b/src/vs/editor/common/diff/rangeMapping.ts
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { LineRange } from 'vs/editor/common/core/lineRange';
+import { Range } from 'vs/editor/common/core/range';
+
+export class LineRangeMapping {
+	public static inverse(mapping: readonly DetailedLineRangeMapping[], originalLineCount: number, modifiedLineCount: number): DetailedLineRangeMapping[] {
+		const result: DetailedLineRangeMapping[] = [];
+		let lastOriginalEndLineNumber = 1;
+		let lastModifiedEndLineNumber = 1;
+
+		for (const m of mapping) {
+			const r = new DetailedLineRangeMapping(
+				new LineRange(lastOriginalEndLineNumber, m.original.startLineNumber),
+				new LineRange(lastModifiedEndLineNumber, m.modified.startLineNumber),
+				undefined
+			);
+			if (!r.modified.isEmpty) {
+				result.push(r);
+			}
+			lastOriginalEndLineNumber = m.original.endLineNumberExclusive;
+			lastModifiedEndLineNumber = m.modified.endLineNumberExclusive;
+		}
+		const r = new DetailedLineRangeMapping(
+			new LineRange(lastOriginalEndLineNumber, originalLineCount + 1),
+			new LineRange(lastModifiedEndLineNumber, modifiedLineCount + 1),
+			undefined
+		);
+		if (!r.modified.isEmpty) {
+			result.push(r);
+		}
+		return result;
+	}
+
+	/**
+	 * The line range in the original text model.
+	 */
+	public readonly original: LineRange;
+
+	/**
+	 * The line range in the modified text model.
+	 */
+	public readonly modified: LineRange;
+
+	constructor(
+		originalRange: LineRange,
+		modifiedRange: LineRange
+	) {
+		this.original = originalRange;
+		this.modified = modifiedRange;
+	}
+
+
+	public toString(): string {
+		return `{${this.original.toString()}->${this.modified.toString()}}`;
+	}
+
+	public flip(): LineRangeMapping {
+		return new LineRangeMapping(this.modified, this.original);
+	}
+
+	public join(other: LineRangeMapping): LineRangeMapping {
+		return new LineRangeMapping(
+			this.original.join(other.original),
+			this.modified.join(other.modified)
+		);
+	}
+
+	public get changedLineCount() {
+		return Math.max(this.original.length, this.modified.length);
+	}
+}
+
+/**
+ * Maps a line range in the original text model to a line range in the modified text model.
+ */
+export class DetailedLineRangeMapping extends LineRangeMapping {
+	/**
+	 * If inner changes have not been computed, this is set to undefined.
+	 * Otherwise, it represents the character-level diff in this line range.
+	 * The original range of each range mapping should be contained in the original line range (same for modified), exceptions are new-lines.
+	 * Must not be an empty array.
+	 */
+	public readonly innerChanges: RangeMapping[] | undefined;
+
+	constructor(
+		originalRange: LineRange,
+		modifiedRange: LineRange,
+		innerChanges: RangeMapping[] | undefined
+	) {
+		super(originalRange, modifiedRange);
+		this.innerChanges = innerChanges;
+	}
+
+	public override flip(): DetailedLineRangeMapping {
+		return new DetailedLineRangeMapping(this.modified, this.original, this.innerChanges?.map(c => c.flip()));
+	}
+}
+
+/**
+ * Maps a range in the original text model to a range in the modified text model.
+ */
+export class RangeMapping {
+	/**
+	 * The original range.
+	 */
+	readonly originalRange: Range;
+
+	/**
+	 * The modified range.
+	 */
+	readonly modifiedRange: Range;
+
+	constructor(
+		originalRange: Range,
+
+		modifiedRange: Range
+	) {
+		this.originalRange = originalRange;
+		this.modifiedRange = modifiedRange;
+	}
+
+	public toString(): string {
+		return `{${this.originalRange.toString()}->${this.modifiedRange.toString()}}`;
+	}
+
+	public flip(): RangeMapping {
+		return new RangeMapping(this.modifiedRange, this.originalRange);
+	}
+}
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index ca8364f62d3..335e6b5c883 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -21,7 +21,8 @@ import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { UnicodeTextModelHighlighter, UnicodeHighlighterOptions } from 'vs/editor/common/services/unicodeTextModelHighlighter';
 import { DiffComputer, IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { ILinesDiffComputer, ILinesDiffComputerOptions, LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { ILinesDiffComputer, ILinesDiffComputerOptions } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from '../diff/rangeMapping';
 import { linesDiffComputers } from 'vs/editor/common/diff/linesDiffComputers';
 import { createProxyObject, getAllMethodNames } from 'vs/base/common/objects';
 import { IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
@@ -422,8 +423,8 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 		const identical = (result.changes.length > 0 ? false : this._modelsAreIdentical(originalTextModel, modifiedTextModel));
 
-		function getLineChanges(changes: readonly LineRangeMapping[]): ILineChange[] {
-			return changes.map(m => ([m.originalRange.startLineNumber, m.originalRange.endLineNumberExclusive, m.modifiedRange.startLineNumber, m.modifiedRange.endLineNumberExclusive, m.innerChanges?.map(m => [
+		function getLineChanges(changes: readonly DetailedLineRangeMapping[]): ILineChange[] {
+			return changes.map(m => ([m.original.startLineNumber, m.original.endLineNumberExclusive, m.modified.startLineNumber, m.modified.endLineNumberExclusive, m.innerChanges?.map(m => [
 				m.originalRange.startLineNumber,
 				m.originalRange.startColumn,
 				m.originalRange.endLineNumber,
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index 005e48ad530..bf010adb6ab 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -34,7 +34,8 @@ import { EditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensi
 import { IMenuItem, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { LineRangeMapping, MovedText, RangeMapping, SimpleLineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping, RangeMapping, LineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { EditorZoom } from 'vs/editor/common/config/editorZoom';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -584,11 +585,11 @@ export function createMonacoEditorAPI(): typeof monaco.editor {
 		FindMatch: <any>FindMatch,
 		ApplyUpdateResult: <any>ApplyUpdateResult,
 		LineRange: <any>LineRange,
-		LineRangeMapping: <any>LineRangeMapping,
+		LineRangeMapping: <any>DetailedLineRangeMapping,
 		RangeMapping: <any>RangeMapping,
 		EditorZoom: <any>EditorZoom,
 		MovedText: <any>MovedText,
-		SimpleLineRangeMapping: <any>SimpleLineRangeMapping,
+		SimpleLineRangeMapping: <any>LineRangeMapping,
 
 		// vars
 		EditorType: EditorType,
diff --git a/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts b/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
index c9980e34a08..6adb654d142 100644
--- a/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
+++ b/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
@@ -6,7 +6,7 @@
 import assert = require('assert');
 import { UnchangedRegion } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel';
 import { LineRange } from 'vs/editor/common/core/lineRange';
-import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 
 suite('DiffEditorWidget2', () => {
 	suite('UnchangedRegion', () => {
@@ -16,7 +16,7 @@ suite('DiffEditorWidget2', () => {
 
 		test('Everything changed', () => {
 			assert.deepStrictEqual(serialize(UnchangedRegion.fromDiffs(
-				[new LineRangeMapping(new LineRange(1, 10), new LineRange(1, 10), [])],
+				[new DetailedLineRangeMapping(new LineRange(1, 10), new LineRange(1, 10), [])],
 				10,
 				10,
 				3,
@@ -38,7 +38,7 @@ suite('DiffEditorWidget2', () => {
 
 		test('Change in the middle', () => {
 			assert.deepStrictEqual(serialize(UnchangedRegion.fromDiffs(
-				[new LineRangeMapping(new LineRange(50, 60), new LineRange(50, 60), [])],
+				[new DetailedLineRangeMapping(new LineRange(50, 60), new LineRange(50, 60), [])],
 				100,
 				100,
 				3,
@@ -51,7 +51,7 @@ suite('DiffEditorWidget2', () => {
 
 		test('Change at the end', () => {
 			assert.deepStrictEqual(serialize(UnchangedRegion.fromDiffs(
-				[new LineRangeMapping(new LineRange(99, 100), new LineRange(100, 100), [])],
+				[new DetailedLineRangeMapping(new LineRange(99, 100), new LineRange(100, 100), [])],
 				100,
 				100,
 				3,
diff --git a/src/vs/editor/test/common/core/lineRange.test.ts b/src/vs/editor/test/common/core/lineRange.test.ts
new file mode 100644
index 00000000000..08aa57bae8d
--- /dev/null
+++ b/src/vs/editor/test/common/core/lineRange.test.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert = require('assert');
+import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
+
+suite('LineRange', () => {
+	test('contains', () => {
+		const r = new LineRange(2, 3);
+		assert.deepStrictEqual(r.contains(1), false);
+		assert.deepStrictEqual(r.contains(2), true);
+		assert.deepStrictEqual(r.contains(3), true);
+		assert.deepStrictEqual(r.contains(4), false);
+	});
+});
+
+suite('LineRangeSet', () => {
+	test('addRange', () => {
+		const set = new LineRangeSet();
+		set.addRange(new LineRange(2, 3));
+		set.addRange(new LineRange(3, 4));
+		set.addRange(new LineRange(10, 20));
+		assert.deepStrictEqual(set.toString(), '[2,4), [10,20)');
+
+		set.addRange(new LineRange(3, 21));
+		assert.deepStrictEqual(set.toString(), '[2,21)');
+	});
+
+	test('getUnion', () => {
+		const set1 = new LineRangeSet([
+			new LineRange(2, 3),
+			new LineRange(5, 7),
+			new LineRange(10, 20)
+		]);
+		const set2 = new LineRangeSet([
+			new LineRange(3, 4),
+			new LineRange(6, 8),
+			new LineRange(9, 11)
+		]);
+
+		const union = set1.getUnion(set2);
+		assert.deepStrictEqual(union.toString(), '[2,4), [5,8), [9,20)');
+	});
+
+	test('intersects', () => {
+		const set1 = new LineRangeSet([
+			new LineRange(2, 3),
+			new LineRange(5, 7),
+			new LineRange(10, 20)
+		]);
+
+		assert.deepStrictEqual(set1.intersects(new LineRange(1, 2)), false);
+		assert.deepStrictEqual(set1.intersects(new LineRange(1, 3)), true);
+		assert.deepStrictEqual(set1.intersects(new LineRange(3, 5)), false);
+	});
+});
diff --git a/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts b/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
new file mode 100644
index 00000000000..f5e4bbacdbc
--- /dev/null
+++ b/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 'assert';
+import { Range } from 'vs/editor/common/core/range';
+import { RangeMapping } from 'vs/editor/common/diff/rangeMapping';
+import { LinesSliceCharSequence, getLineRangeMapping } from 'vs/editor/common/diff/advancedLinesDiffComputer';
+import { OffsetRange } from 'vs/editor/common/core/offsetRange';
+
+suite('lineRangeMapping', () => {
+	test('1', () => {
+		assert.deepStrictEqual(
+			getLineRangeMapping(
+				new RangeMapping(
+					new Range(2, 1, 3, 1),
+					new Range(2, 1, 2, 1)
+				),
+				[
+					'const abc = "helloworld".split("");',
+					'',
+					''
+				],
+				[
+					'const asciiLower = "helloworld".split("");',
+					''
+				]
+			).toString(),
+			"{[2,3)->[2,2)}"
+		);
+	});
+
+	test('2', () => {
+		assert.deepStrictEqual(
+			getLineRangeMapping(
+				new RangeMapping(
+					new Range(2, 1, 2, 1),
+					new Range(2, 1, 4, 1),
+				),
+				[
+					'',
+					'',
+				],
+				[
+					'',
+					'',
+					'',
+					'',
+				]
+			).toString(),
+			"{[2,2)->[2,4)}"
+		);
+	});
+});
+
+suite('LinesSliceCharSequence', () => {
+	// Create tests for translateOffset
+
+	const sequence = new LinesSliceCharSequence(
+		[
+			'line1: foo',
+			'line2: fizzbuzz',
+			'line3: barr',
+			'line4: hello world',
+			'line5: bazz',
+		],
+		new OffsetRange(1, 4), true
+	);
+
+	test('translateOffset', () => {
+		assert.deepStrictEqual(
+			{ result: OffsetRange.ofLength(sequence.length).map(offset => sequence.translateOffset(offset).toString()) },
+			({
+				result: [
+					"(2,1)", "(2,2)", "(2,3)", "(2,4)", "(2,5)", "(2,6)", "(2,7)", "(2,8)", "(2,9)", "(2,10)", "(2,11)",
+					"(2,12)", "(2,13)", "(2,14)", "(2,15)", "(2,16)",
+
+					"(3,1)", "(3,2)", "(3,3)", "(3,4)", "(3,5)", "(3,6)", "(3,7)", "(3,8)", "(3,9)", "(3,10)", "(3,11)", "(3,12)",
+
+					"(4,1)", "(4,2)", "(4,3)", "(4,4)", "(4,5)", "(4,6)", "(4,7)", "(4,8)", "(4,9)",
+					"(4,10)", "(4,11)", "(4,12)", "(4,13)", "(4,14)", "(4,15)", "(4,16)", "(4,17)",
+					"(4,18)", "(4,19)"
+				]
+			})
+		);
+	});
+
+	test('extendToFullLines', () => {
+		assert.deepStrictEqual(
+			{ result: sequence.getText(sequence.extendToFullLines(new OffsetRange(20, 25))) },
+			({ result: "line3: barr\n" })
+		);
+
+		assert.deepStrictEqual(
+			{ result: sequence.getText(sequence.extendToFullLines(new OffsetRange(20, 45))) },
+			({ result: "line3: barr\nline4: hello world\n" })
+		);
+	});
+});
diff --git a/src/vs/editor/test/node/diffing/diffingFixture.test.ts b/src/vs/editor/test/node/diffing/diffingFixture.test.ts
index a04f2edf9d8..89490813b78 100644
--- a/src/vs/editor/test/node/diffing/diffingFixture.test.ts
+++ b/src/vs/editor/test/node/diffing/diffingFixture.test.ts
@@ -8,7 +8,7 @@ import { existsSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'fs
 import { join, resolve } from 'path';
 import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { FileAccess } from 'vs/base/common/network';
-import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { LegacyLinesDiffComputer } from 'vs/editor/common/diff/legacyLinesDiffComputer';
 import { AdvancedLinesDiffComputer } from 'vs/editor/common/diff/advancedLinesDiffComputer';
 
@@ -43,10 +43,10 @@ suite('diff fixtures', () => {
 		const ignoreTrimWhitespace = folder.indexOf('trimws') >= 0;
 		const diff = diffingAlgo.computeDiff(firstContentLines, secondContentLines, { ignoreTrimWhitespace, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false });
 
-		function getDiffs(changes: readonly LineRangeMapping[]): IDetailedDiff[] {
+		function getDiffs(changes: readonly DetailedLineRangeMapping[]): IDetailedDiff[] {
 			return changes.map<IDetailedDiff>(c => ({
-				originalRange: c.originalRange.toString(),
-				modifiedRange: c.modifiedRange.toString(),
+				originalRange: c.original.toString(),
+				modifiedRange: c.modified.toString(),
 				innerChanges: c.innerChanges?.map<IDiff>(c => ({
 					originalRange: c.originalRange.toString(),
 					modifiedRange: c.modifiedRange.toString(),
diff --git a/src/vs/editor/test/node/diffing/lineRangeMapping.test.ts b/src/vs/editor/test/node/diffing/lineRangeMapping.test.ts
deleted file mode 100644
index f0d0802912d..00000000000
--- a/src/vs/editor/test/node/diffing/lineRangeMapping.test.ts
+++ /dev/null
@@ -1,54 +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 'assert';
-import { Range } from 'vs/editor/common/core/range';
-import { RangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
-import { getLineRangeMapping } from 'vs/editor/common/diff/advancedLinesDiffComputer';
-
-suite('lineRangeMapping', () => {
-	test('1', () => {
-		assert.deepStrictEqual(
-			getLineRangeMapping(
-				new RangeMapping(
-					new Range(2, 1, 3, 1),
-					new Range(2, 1, 2, 1)
-				),
-				[
-					'const abc = "helloworld".split("");',
-					'',
-					''
-				],
-				[
-					'const asciiLower = "helloworld".split("");',
-					''
-				]
-			).toString(),
-			"{[2,3)->[2,2)}"
-		);
-	});
-
-	test('2', () => {
-		assert.deepStrictEqual(
-			getLineRangeMapping(
-				new RangeMapping(
-					new Range(2, 1, 2, 1),
-					new Range(2, 1, 4, 1),
-				),
-				[
-					'',
-					'',
-				],
-				[
-					'',
-					'',
-					'',
-					'',
-				]
-			).toString(),
-			"{[2,2)->[2,4)}"
-		);
-	});
-});
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatLivePreviewWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatLivePreviewWidget.ts
index 1374da20090..a9b339e7ae5 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatLivePreviewWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatLivePreviewWidget.ts
@@ -18,7 +18,7 @@ import * as editorColorRegistry from 'vs/editor/common/core/editorColorRegistry'
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { INLINE_CHAT_ID, inlineChatDiffInserted, inlineChatDiffRemoved, inlineChatRegionHighlight } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { LineRange } from 'vs/editor/common/core/lineRange';
-import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { Position } from 'vs/editor/common/core/position';
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { ScrollType } from 'vs/editor/common/editorCommon';
@@ -163,7 +163,7 @@ export class InlineChatLivePreviewWidget extends ZoneWidget {
 		this._isDiffLocked = true;
 	}
 
-	private _updateFromChanges(range: Range, changes: readonly LineRangeMapping[]): void {
+	private _updateFromChanges(range: Range, changes: readonly DetailedLineRangeMapping[]): void {
 		assertType(this.editor.hasModel());
 
 		if (this._isDiffLocked) {
@@ -177,7 +177,7 @@ export class InlineChatLivePreviewWidget extends ZoneWidget {
 
 	// --- full diff
 
-	private _renderChangesWithFullDiff(changes: readonly LineRangeMapping[], range: Range) {
+	private _renderChangesWithFullDiff(changes: readonly DetailedLineRangeMapping[], range: Range) {
 
 		const modified = this.editor.getModel()!;
 		const ranges = this._computeHiddenRanges(modified, range, changes);
@@ -206,16 +206,16 @@ export class InlineChatLivePreviewWidget extends ZoneWidget {
 		super.hide();
 	}
 
-	private _computeHiddenRanges(model: ITextModel, range: Range, changes: readonly LineRangeMapping[]) {
+	private _computeHiddenRanges(model: ITextModel, range: Range, changes: readonly DetailedLineRangeMapping[]) {
 		if (changes.length === 0) {
-			changes = [new LineRangeMapping(LineRange.fromRange(range), LineRange.fromRange(range), undefined)];
+			changes = [new DetailedLineRangeMapping(LineRange.fromRange(range), LineRange.fromRange(range), undefined)];
 		}
 
-		let originalLineRange = changes[0].originalRange;
-		let modifiedLineRange = changes[0].modifiedRange;
+		let originalLineRange = changes[0].original;
+		let modifiedLineRange = changes[0].modified;
 		for (let i = 1; i < changes.length; i++) {
-			originalLineRange = originalLineRange.join(changes[i].originalRange);
-			modifiedLineRange = modifiedLineRange.join(changes[i].modifiedRange);
+			originalLineRange = originalLineRange.join(changes[i].original);
+			modifiedLineRange = modifiedLineRange.join(changes[i].modified);
 		}
 
 		const startDelta = modifiedLineRange.startLineNumber - range.startLineNumber;
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
index fcbb998dc79..8de79727cea 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
@@ -23,7 +23,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { Iterable } from 'vs/base/common/iterator';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { isCancellationError } from 'vs/base/common/errors';
-import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
 import { raceCancellation } from 'vs/base/common/async';
 
@@ -112,7 +112,7 @@ export class Session {
 
 	private _lastInput: SessionPrompt | undefined;
 	private _lastExpansionState: ExpansionState | undefined;
-	private _lastTextModelChanges: readonly LineRangeMapping[] | undefined;
+	private _lastTextModelChanges: readonly DetailedLineRangeMapping[] | undefined;
 	private _isUnstashed: boolean = false;
 	private readonly _exchange: SessionExchange[] = [];
 	private readonly _startTime = new Date();
@@ -191,7 +191,7 @@ export class Session {
 		return this._lastTextModelChanges ?? [];
 	}
 
-	set lastTextModelChanges(changes: readonly LineRangeMapping[]) {
+	set lastTextModelChanges(changes: readonly DetailedLineRangeMapping[]) {
 		this._lastTextModelChanges = changes;
 	}
 
@@ -207,8 +207,8 @@ export class Session {
 		let startLine = Number.MAX_VALUE;
 		let endLine = Number.MIN_VALUE;
 		for (const change of this._lastTextModelChanges) {
-			startLine = Math.min(startLine, change.modifiedRange.startLineNumber);
-			endLine = Math.max(endLine, change.modifiedRange.endLineNumberExclusive);
+			startLine = Math.min(startLine, change.modified.startLineNumber);
+			endLine = Math.max(endLine, change.modified.endLineNumberExclusive);
 		}
 
 		return this.textModelN.getValueInRange(new Range(startLine, 1, endLine, Number.MAX_VALUE));
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
index c3a08e55ce9..76944f5b38e 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
@@ -354,7 +354,7 @@ export class LiveStrategy extends EditModeStrategy {
 		const lastTextModelChanges = this._session.lastTextModelChanges;
 		let lastLineOfLocalEdits: number | undefined;
 		for (const change of lastTextModelChanges) {
-			const changeEndLineNumber = change.modifiedRange.endLineNumberExclusive - 1;
+			const changeEndLineNumber = change.modified.endLineNumberExclusive - 1;
 			if (typeof lastLineOfLocalEdits === 'undefined' || lastLineOfLocalEdits < changeEndLineNumber) {
 				lastLineOfLocalEdits = changeEndLineNumber;
 			}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
index 343749ce5c6..9703af6a00a 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
@@ -36,7 +36,7 @@ import { FileKind } from 'vs/platform/files/common/files';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { LanguageSelector } from 'vs/editor/common/languageSelector';
 import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
-import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { invertLineRange, lineRangeAsRange } from 'vs/workbench/contrib/inlineChat/browser/utils';
 import { ICodeEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
 import { LineRange } from 'vs/editor/common/core/lineRange';
@@ -612,7 +612,7 @@ export class InlineChatWidget {
 
 	// --- preview
 
-	showEditsPreview(textModelv0: ITextModel, allEdits: ISingleEditOperation[][], changes: readonly LineRangeMapping[]) {
+	showEditsPreview(textModelv0: ITextModel, allEdits: ISingleEditOperation[][], changes: readonly DetailedLineRangeMapping[]) {
 		if (changes.length === 0) {
 			this.hideEditsPreview();
 			return;
@@ -628,11 +628,11 @@ export class InlineChatWidget {
 		this._previewDiffEditor.value.setModel({ original: textModelv0, modified });
 
 		// joined ranges
-		let originalLineRange = changes[0].originalRange;
-		let modifiedLineRange = changes[0].modifiedRange;
+		let originalLineRange = changes[0].original;
+		let modifiedLineRange = changes[0].modified;
 		for (let i = 1; i < changes.length; i++) {
-			originalLineRange = originalLineRange.join(changes[i].originalRange);
-			modifiedLineRange = modifiedLineRange.join(changes[i].modifiedRange);
+			originalLineRange = originalLineRange.join(changes[i].original);
+			modifiedLineRange = modifiedLineRange.join(changes[i].modified);
 		}
 
 		// apply extra padding
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts
index cc1be27460f..334479df903 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts
@@ -5,7 +5,7 @@
 
 import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
 import { IReader } from 'vs/base/common/observable';
-import { RangeMapping as DiffRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
+import { RangeMapping as DiffRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { ITextModel } from 'vs/editor/common/model';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -56,9 +56,9 @@ export class MergeDiffComputer implements IMergeDiffComputer {
 
 		const changes = result.changes.map(c =>
 			new DetailedLineRangeMapping(
-				toLineRange(c.originalRange),
+				toLineRange(c.original),
 				textModel1,
-				toLineRange(c.modifiedRange),
+				toLineRange(c.modified),
 				textModel2,
 				c.innerChanges?.map(ic => toRangeMapping(ic))
 			)
diff --git a/src/vs/workbench/contrib/mergeEditor/test/browser/model.test.ts b/src/vs/workbench/contrib/mergeEditor/test/browser/model.test.ts
index d411e9a4c1f..0441e4483d3 100644
--- a/src/vs/workbench/contrib/mergeEditor/test/browser/model.test.ts
+++ b/src/vs/workbench/contrib/mergeEditor/test/browser/model.test.ts
@@ -290,9 +290,9 @@ class MergeModelInterface extends Disposable {
 				);
 				const changes = result.changes.map(c =>
 					new DetailedLineRangeMapping(
-						toLineRange(c.originalRange),
+						toLineRange(c.original),
 						textModel1,
-						toLineRange(c.modifiedRange),
+						toLineRange(c.modified),
 						textModel2,
 						c.innerChanges?.map(ic => toRangeMapping(ic)).filter(isDefined)
 					)

From 4d53e0a13649b3a49e4ee2f2d15577aa581b70bb Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 1 Sep 2023 13:32:21 +0200
Subject: [PATCH 29/94] Fixes CI

---
 build/monaco/monaco.d.ts.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index 89c884f18a0..3af07387f51 100644
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -110,7 +110,7 @@ export interface ICommandHandler {
 #include(vs/editor/common/diff/legacyLinesDiffComputer): IChange, ICharChange, ILineChange
 #include(vs/editor/common/diff/documentDiffProvider): IDocumentDiffProvider, IDocumentDiffProviderOptions, IDocumentDiff
 #include(vs/editor/common/core/lineRange): LineRange
-#include(vs/editor/common/diff/linesDiffComputer): LineRangeMapping, RangeMapping, MovedText, SimpleLineRangeMapping
+#include(vs/editor/common/diff/linesDiffComputer): DetailedLineRangeMapping, RangeMapping, MovedText, LineRangeMapping
 #include(vs/editor/common/core/dimension): IDimension
 #includeAll(vs/editor/common/editorCommon): IScrollEvent
 #includeAll(vs/editor/common/textModelEvents):

From fe25a72de8ea3cefcf95946bb9f3c82bef001b6d Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 1 Sep 2023 14:01:32 +0200
Subject: [PATCH 30/94] Fixes CI

---
 build/monaco/monaco.d.ts.recipe               |  3 +-
 .../standalone/browser/standaloneEditor.ts    |  4 +-
 src/vs/monaco.d.ts                            | 58 ++++++++-----------
 3 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index 3af07387f51..4f064aeb6f1 100644
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -110,7 +110,8 @@ export interface ICommandHandler {
 #include(vs/editor/common/diff/legacyLinesDiffComputer): IChange, ICharChange, ILineChange
 #include(vs/editor/common/diff/documentDiffProvider): IDocumentDiffProvider, IDocumentDiffProviderOptions, IDocumentDiff
 #include(vs/editor/common/core/lineRange): LineRange
-#include(vs/editor/common/diff/linesDiffComputer): DetailedLineRangeMapping, RangeMapping, MovedText, LineRangeMapping
+#include(vs/editor/common/diff/linesDiffComputer): MovedText
+#include(vs/editor/common/diff/rangeMapping): DetailedLineRangeMapping, RangeMapping, LineRangeMapping
 #include(vs/editor/common/core/dimension): IDimension
 #includeAll(vs/editor/common/editorCommon): IScrollEvent
 #includeAll(vs/editor/common/textModelEvents):
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index bf010adb6ab..9d529b71049 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -585,11 +585,11 @@ export function createMonacoEditorAPI(): typeof monaco.editor {
 		FindMatch: <any>FindMatch,
 		ApplyUpdateResult: <any>ApplyUpdateResult,
 		LineRange: <any>LineRange,
-		LineRangeMapping: <any>DetailedLineRangeMapping,
+		DetailedLineRangeMapping: <any>DetailedLineRangeMapping,
 		RangeMapping: <any>RangeMapping,
 		EditorZoom: <any>EditorZoom,
 		MovedText: <any>MovedText,
-		SimpleLineRangeMapping: <any>LineRangeMapping,
+		LineRangeMapping: <any>LineRangeMapping,
 
 		// vars
 		EditorType: EditorType,
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 3a49dbf4aa5..51ce58011f8 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -2415,7 +2415,7 @@ declare namespace monaco.editor {
 		/**
 		 * Maps all modified line ranges in the original to the corresponding line ranges in the modified text model.
 		 */
-		readonly changes: readonly LineRangeMapping[];
+		readonly changes: readonly DetailedLineRangeMapping[];
 		/**
 		 * Sorted by original line ranges.
 		 * The original line ranges and the modified line ranges must be disjoint (but can be touching).
@@ -2433,11 +2433,6 @@ declare namespace monaco.editor {
 		 * @param lineRanges An array of sorted line ranges.
 		 */
 		static joinMany(lineRanges: readonly (readonly LineRange[])[]): readonly LineRange[];
-		/**
-		 * @param lineRanges1 Must be sorted.
-		 * @param lineRanges2 Must be sorted.
-		 */
-		static join(lineRanges1: readonly LineRange[], lineRanges2: readonly LineRange[]): readonly LineRange[];
 		static ofLength(startLineNumber: number, length: number): LineRange;
 		/**
 		 * The start line number.
@@ -2485,19 +2480,22 @@ declare namespace monaco.editor {
 		includes(lineNumber: number): boolean;
 	}
 
+	export class MovedText {
+		readonly lineRangeMapping: LineRangeMapping;
+		/**
+		 * The diff from the original text to the moved text.
+		 * Must be contained in the original/modified line range.
+		 * Can be empty if the text didn't change (only moved).
+		 */
+		readonly changes: readonly DetailedLineRangeMapping[];
+		constructor(lineRangeMapping: LineRangeMapping, changes: readonly DetailedLineRangeMapping[]);
+		flip(): MovedText;
+	}
+
 	/**
 	 * Maps a line range in the original text model to a line range in the modified text model.
 	 */
-	export class LineRangeMapping {
-		static inverse(mapping: readonly LineRangeMapping[], originalLineCount: number, modifiedLineCount: number): LineRangeMapping[];
-		/**
-		 * The line range in the original text model.
-		 */
-		readonly originalRange: LineRange;
-		/**
-		 * The line range in the modified text model.
-		 */
-		readonly modifiedRange: LineRange;
+	export class DetailedLineRangeMapping extends LineRangeMapping {
 		/**
 		 * If inner changes have not been computed, this is set to undefined.
 		 * Otherwise, it represents the character-level diff in this line range.
@@ -2506,9 +2504,7 @@ declare namespace monaco.editor {
 		 */
 		readonly innerChanges: RangeMapping[] | undefined;
 		constructor(originalRange: LineRange, modifiedRange: LineRange, innerChanges: RangeMapping[] | undefined);
-		toString(): string;
-		get changedLineCount(): any;
-		flip(): LineRangeMapping;
+		flip(): DetailedLineRangeMapping;
 	}
 
 	/**
@@ -2528,25 +2524,21 @@ declare namespace monaco.editor {
 		flip(): RangeMapping;
 	}
 
-	export class MovedText {
-		readonly lineRangeMapping: SimpleLineRangeMapping;
+	export class LineRangeMapping {
+		static inverse(mapping: readonly DetailedLineRangeMapping[], originalLineCount: number, modifiedLineCount: number): DetailedLineRangeMapping[];
 		/**
-		 * The diff from the original text to the moved text.
-		 * Must be contained in the original/modified line range.
-		 * Can be empty if the text didn't change (only moved).
+		 * The line range in the original text model.
 		 */
-		readonly changes: readonly LineRangeMapping[];
-		constructor(lineRangeMapping: SimpleLineRangeMapping, changes: readonly LineRangeMapping[]);
-		flip(): MovedText;
-	}
-
-	export class SimpleLineRangeMapping {
 		readonly original: LineRange;
+		/**
+		 * The line range in the modified text model.
+		 */
 		readonly modified: LineRange;
-		constructor(original: LineRange, modified: LineRange);
+		constructor(originalRange: LineRange, modifiedRange: LineRange);
 		toString(): string;
-		flip(): SimpleLineRangeMapping;
-		join(other: SimpleLineRangeMapping): SimpleLineRangeMapping;
+		flip(): LineRangeMapping;
+		join(other: LineRangeMapping): LineRangeMapping;
+		get changedLineCount(): any;
 	}
 	export interface IDimension {
 		width: number;

From 0ae7b5b1c5aef9c195c1b6366b7a4e19fdecb314 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 1 Sep 2023 14:21:24 +0200
Subject: [PATCH 31/94] Fixes tests

---
 src/vs/editor/test/common/core/lineRange.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/test/common/core/lineRange.test.ts b/src/vs/editor/test/common/core/lineRange.test.ts
index 08aa57bae8d..535a20607b1 100644
--- a/src/vs/editor/test/common/core/lineRange.test.ts
+++ b/src/vs/editor/test/common/core/lineRange.test.ts
@@ -11,7 +11,7 @@ suite('LineRange', () => {
 		const r = new LineRange(2, 3);
 		assert.deepStrictEqual(r.contains(1), false);
 		assert.deepStrictEqual(r.contains(2), true);
-		assert.deepStrictEqual(r.contains(3), true);
+		assert.deepStrictEqual(r.contains(3), false);
 		assert.deepStrictEqual(r.contains(4), false);
 	});
 });

From 660e12b312542b6fc0f6fe5d2fe7c5b749a19af1 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 1 Sep 2023 15:32:38 +0200
Subject: [PATCH 32/94] editors - restore focus also in `addGroup` (#191961)

---
 src/vs/workbench/browser/parts/editor/editorPart.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index c424f439a4f..8b733caa867 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -515,12 +515,21 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
 	addGroup(location: IEditorGroupView | GroupIdentifier, direction: GroupDirection, options?: IAddGroupOptions): IEditorGroupView {
 		const locationView = this.assertGroupView(location);
 
+		const restoreFocus = this.shouldRestoreFocus(locationView.element);
+
 		const group = this.doAddGroup(locationView, direction);
 
 		if (options?.activate) {
 			this.doSetGroupActive(group);
 		}
 
+		// Restore focus if we had it previously after completing the grid
+		// operation. That operation might cause reparenting of grid views
+		// which moves focus to the <body> element otherwise.
+		if (restoreFocus) {
+			locationView.focus();
+		}
+
 		return group;
 	}
 

From 4f424db46e05e241a7f3440384bd82b7ea393b17 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 1 Sep 2023 15:33:06 +0200
Subject: [PATCH 33/94] debt - ensure `file` scheme when using `.fsPath`
 (#191960)

---
 src/vs/code/electron-main/main.ts                     |  8 ++++----
 src/vs/code/node/cliProcessMain.ts                    |  2 +-
 .../node/sharedProcess/contrib/logsDataCleaner.ts     | 11 ++++++-----
 .../node/sharedProcess/contrib/storageDataCleaner.ts  |  6 ++++--
 .../protocol/electron-main/protocolMainService.ts     |  4 ++--
 src/vs/platform/storage/common/storageService.ts      |  7 ++++---
 src/vs/platform/storage/electron-main/storageMain.ts  |  7 ++++---
 .../storage/electron-main/storageMainService.ts       |  3 ++-
 .../terminal/electron-main/electronPtyHostStarter.ts  |  3 ++-
 src/vs/platform/terminal/node/nodePtyHostStarter.ts   |  4 ++--
 .../windows/electron-main/windowsMainService.ts       |  6 +++---
 .../electron-main/workspacesManagementMainService.ts  |  4 ++--
 src/vs/server/node/serverServices.ts                  |  2 +-
 .../contrib/files/electron-sandbox/fileCommands.ts    |  2 +-
 .../electron-sandbox/localHistoryCommands.ts          |  2 +-
 .../contrib/logs/electron-sandbox/logsActions.ts      |  5 +++--
 .../electron-sandbox/userDataSync.contribution.ts     |  3 ++-
 17 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 0174a24c3c8..7bdb1e1a459 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -251,10 +251,10 @@ class CodeMain {
 			Promise.all<string | undefined>([
 				environmentMainService.extensionsPath,
 				environmentMainService.codeCachePath,
-				environmentMainService.logsHome.fsPath,
-				userDataProfilesMainService.defaultProfile.globalStorageHome.fsPath,
-				environmentMainService.workspaceStorageHome.fsPath,
-				environmentMainService.localHistoryHome.fsPath,
+				environmentMainService.logsHome.with({ scheme: Schemas.file }).fsPath,
+				userDataProfilesMainService.defaultProfile.globalStorageHome.with({ scheme: Schemas.file }).fsPath,
+				environmentMainService.workspaceStorageHome.with({ scheme: Schemas.file }).fsPath,
+				environmentMainService.localHistoryHome.with({ scheme: Schemas.file }).fsPath,
 				environmentMainService.backupHome
 			].map(path => path ? FSPromises.mkdir(path, { recursive: true }) : undefined)),
 
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index a003267c043..b97aa7a0be8 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -121,7 +121,7 @@ class CliMain extends Disposable {
 
 		// Init folders
 		await Promise.all([
-			environmentService.appSettingsHome.fsPath,
+			environmentService.appSettingsHome.with({ scheme: Schemas.file }).fsPath,
 			environmentService.extensionsPath
 		].map(path => path ? Promises.mkdir(path, { recursive: true }) : undefined));
 
diff --git a/src/vs/code/node/sharedProcess/contrib/logsDataCleaner.ts b/src/vs/code/node/sharedProcess/contrib/logsDataCleaner.ts
index ab5f8a1d87a..60a3652edf0 100644
--- a/src/vs/code/node/sharedProcess/contrib/logsDataCleaner.ts
+++ b/src/vs/code/node/sharedProcess/contrib/logsDataCleaner.ts
@@ -6,7 +6,9 @@
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { basename, dirname, joinPath } from 'vs/base/common/resources';
+import { Schemas } from 'vs/base/common/network';
+import { join } from 'vs/base/common/path';
+import { basename, dirname } from 'vs/base/common/resources';
 import { Promises } from 'vs/base/node/pfs';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -30,9 +32,8 @@ export class LogsDataCleaner extends Disposable {
 
 		try {
 			const currentLog = basename(this.environmentService.logsHome);
-			const logsRoot = dirname(this.environmentService.logsHome);
-
-			const logFiles = await Promises.readdir(logsRoot.fsPath);
+			const logsRoot = dirname(this.environmentService.logsHome.with({ scheme: Schemas.file })).fsPath;
+			const logFiles = await Promises.readdir(logsRoot);
 
 			const allSessions = logFiles.filter(logFile => /^\d{8}T\d{6}$/.test(logFile));
 			const oldSessions = allSessions.sort().filter(session => session !== currentLog);
@@ -41,7 +42,7 @@ export class LogsDataCleaner extends Disposable {
 			if (sessionsToDelete.length > 0) {
 				this.logService.trace(`[logs cleanup]: Removing log folders '${sessionsToDelete.join(', ')}'`);
 
-				await Promise.all(sessionsToDelete.map(sessionToDelete => Promises.rm(joinPath(logsRoot, sessionToDelete).fsPath)));
+				await Promise.all(sessionsToDelete.map(sessionToDelete => Promises.rm(join(logsRoot, sessionToDelete))));
 			}
 		} catch (error) {
 			onUnexpectedError(error);
diff --git a/src/vs/code/node/sharedProcess/contrib/storageDataCleaner.ts b/src/vs/code/node/sharedProcess/contrib/storageDataCleaner.ts
index fc3f2eb117a..da67be66109 100644
--- a/src/vs/code/node/sharedProcess/contrib/storageDataCleaner.ts
+++ b/src/vs/code/node/sharedProcess/contrib/storageDataCleaner.ts
@@ -15,6 +15,7 @@ import { EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE } from 'vs/platform/worksp
 import { NON_EMPTY_WORKSPACE_ID_LENGTH } from 'vs/platform/workspaces/node/workspaces';
 import { INativeHostService } from 'vs/platform/native/common/native';
 import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
+import { Schemas } from 'vs/base/common/network';
 
 export class UnusedWorkspaceStorageDataCleaner extends Disposable {
 
@@ -36,11 +37,12 @@ export class UnusedWorkspaceStorageDataCleaner extends Disposable {
 		this.logService.trace('[storage cleanup]: Starting to clean up workspace storage folders for unused empty workspaces.');
 
 		try {
-			const workspaceStorageFolders = await Promises.readdir(this.environmentService.workspaceStorageHome.fsPath);
+			const workspaceStorageHome = this.environmentService.workspaceStorageHome.with({ scheme: Schemas.file }).fsPath;
+			const workspaceStorageFolders = await Promises.readdir(workspaceStorageHome);
 			const storageClient = new StorageClient(this.mainProcessService.getChannel('storage'));
 
 			await Promise.all(workspaceStorageFolders.map(async workspaceStorageFolder => {
-				const workspaceStoragePath = join(this.environmentService.workspaceStorageHome.fsPath, workspaceStorageFolder);
+				const workspaceStoragePath = join(workspaceStorageHome, workspaceStorageFolder);
 
 				if (workspaceStorageFolder.length === NON_EMPTY_WORKSPACE_ID_LENGTH) {
 					return; // keep workspace storage for folders/workspaces that can be accessed still
diff --git a/src/vs/platform/protocol/electron-main/protocolMainService.ts b/src/vs/platform/protocol/electron-main/protocolMainService.ts
index 79d431b275c..2b0a52627a8 100644
--- a/src/vs/platform/protocol/electron-main/protocolMainService.ts
+++ b/src/vs/platform/protocol/electron-main/protocolMainService.ts
@@ -39,8 +39,8 @@ export class ProtocolMainService extends Disposable implements IProtocolMainServ
 		// - storage    : all files in global and workspace storage (https://github.com/microsoft/vscode/issues/116735)
 		this.addValidFileRoot(environmentService.appRoot);
 		this.addValidFileRoot(environmentService.extensionsPath);
-		this.addValidFileRoot(userDataProfilesService.defaultProfile.globalStorageHome.fsPath);
-		this.addValidFileRoot(environmentService.workspaceStorageHome.fsPath);
+		this.addValidFileRoot(userDataProfilesService.defaultProfile.globalStorageHome.with({ scheme: Schemas.file }).fsPath);
+		this.addValidFileRoot(environmentService.workspaceStorageHome.with({ scheme: Schemas.file }).fsPath);
 
 		// Handle protocols
 		this.handleProtocols();
diff --git a/src/vs/platform/storage/common/storageService.ts b/src/vs/platform/storage/common/storageService.ts
index d5231239e0c..4cfe09ec6d4 100644
--- a/src/vs/platform/storage/common/storageService.ts
+++ b/src/vs/platform/storage/common/storageService.ts
@@ -5,6 +5,7 @@
 
 import { Promises } from 'vs/base/common/async';
 import { DisposableStore } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
 import { joinPath } from 'vs/base/common/resources';
 import { IStorage, Storage } from 'vs/base/parts/storage/common/storage';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -117,11 +118,11 @@ export class RemoteStorageService extends AbstractStorageService {
 	protected getLogDetails(scope: StorageScope): string | undefined {
 		switch (scope) {
 			case StorageScope.APPLICATION:
-				return this.applicationStorageProfile.globalStorageHome.fsPath;
+				return this.applicationStorageProfile.globalStorageHome.with({ scheme: Schemas.file }).fsPath;
 			case StorageScope.PROFILE:
-				return this.profileStorageProfile?.globalStorageHome.fsPath;
+				return this.profileStorageProfile?.globalStorageHome.with({ scheme: Schemas.file }).fsPath;
 			default:
-				return this.workspaceStorageId ? `${joinPath(this.environmentService.workspaceStorageHome, this.workspaceStorageId, 'state.vscdb').fsPath}` : undefined;
+				return this.workspaceStorageId ? `${joinPath(this.environmentService.workspaceStorageHome, this.workspaceStorageId, 'state.vscdb').with({ scheme: Schemas.file }).fsPath}` : undefined;
 		}
 	}
 
diff --git a/src/vs/platform/storage/electron-main/storageMain.ts b/src/vs/platform/storage/electron-main/storageMain.ts
index 6acc9643b91..b993f4cb3cd 100644
--- a/src/vs/platform/storage/electron-main/storageMain.ts
+++ b/src/vs/platform/storage/electron-main/storageMain.ts
@@ -20,6 +20,7 @@ import { IS_NEW_KEY } from 'vs/platform/storage/common/storage';
 import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { currentSessionDateStorageKey, firstSessionDateStorageKey, lastSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry';
 import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { Schemas } from 'vs/base/common/network';
 
 export interface IStorageMainOptions {
 
@@ -275,7 +276,7 @@ class BaseProfileAwareStorageMain extends BaseStorageMain {
 
 	get path(): string | undefined {
 		if (!this.options.useInMemoryStorage) {
-			return join(this.profile.globalStorageHome.fsPath, BaseProfileAwareStorageMain.STORAGE_NAME);
+			return join(this.profile.globalStorageHome.with({ scheme: Schemas.file }).fsPath, BaseProfileAwareStorageMain.STORAGE_NAME);
 		}
 
 		return undefined;
@@ -352,7 +353,7 @@ export class WorkspaceStorageMain extends BaseStorageMain {
 
 	get path(): string | undefined {
 		if (!this.options.useInMemoryStorage) {
-			return join(this.environmentService.workspaceStorageHome.fsPath, this.workspace.id, WorkspaceStorageMain.WORKSPACE_STORAGE_NAME);
+			return join(this.environmentService.workspaceStorageHome.with({ scheme: Schemas.file }).fsPath, this.workspace.id, WorkspaceStorageMain.WORKSPACE_STORAGE_NAME);
 		}
 
 		return undefined;
@@ -384,7 +385,7 @@ export class WorkspaceStorageMain extends BaseStorageMain {
 		}
 
 		// Otherwise, ensure the storage folder exists on disk
-		const workspaceStorageFolderPath = join(this.environmentService.workspaceStorageHome.fsPath, this.workspace.id);
+		const workspaceStorageFolderPath = join(this.environmentService.workspaceStorageHome.with({ scheme: Schemas.file }).fsPath, this.workspace.id);
 		const workspaceStorageDatabasePath = join(workspaceStorageFolderPath, WorkspaceStorageMain.WORKSPACE_STORAGE_NAME);
 
 		const storageExists = await Promises.exists(workspaceStorageFolderPath);
diff --git a/src/vs/platform/storage/electron-main/storageMainService.ts b/src/vs/platform/storage/electron-main/storageMainService.ts
index dc8b3c51e59..bdfad4eacb6 100644
--- a/src/vs/platform/storage/electron-main/storageMainService.ts
+++ b/src/vs/platform/storage/electron-main/storageMainService.ts
@@ -19,6 +19,7 @@ import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userData
 import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
 import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { Schemas } from 'vs/base/common/network';
 
 //#region Storage Main Service (intent: make application, profile and workspace storage accessible to windows from main process)
 
@@ -359,7 +360,7 @@ export class ApplicationStorageMainService extends AbstractStorageService implem
 
 	protected getLogDetails(scope: StorageScope): string | undefined {
 		if (scope === StorageScope.APPLICATION) {
-			return this.userDataProfilesService.defaultProfile.globalStorageHome.fsPath;
+			return this.userDataProfilesService.defaultProfile.globalStorageHome.with({ scheme: Schemas.file }).fsPath;
 		}
 
 		return undefined; // any other scope is unsupported from main process
diff --git a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
index a1599f50737..8c74c72b9c9 100644
--- a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
+++ b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
@@ -18,6 +18,7 @@ import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecy
 import { Emitter } from 'vs/base/common/event';
 import { deepClone } from 'vs/base/common/objects';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { Schemas } from 'vs/base/common/network';
 
 export class ElectronPtyHostStarter extends Disposable implements IPtyHostStarter {
 
@@ -58,7 +59,7 @@ export class ElectronPtyHostStarter extends Disposable implements IPtyHostStarte
 			type: 'ptyHost',
 			entryPoint: 'vs/platform/terminal/node/ptyHostMain',
 			execArgv,
-			args: ['--logsPath', this._environmentMainService.logsHome.fsPath],
+			args: ['--logsPath', this._environmentMainService.logsHome.with({ scheme: Schemas.file }).fsPath],
 			env: this._createPtyHostConfiguration()
 		});
 
diff --git a/src/vs/platform/terminal/node/nodePtyHostStarter.ts b/src/vs/platform/terminal/node/nodePtyHostStarter.ts
index a1d4e8b7d88..d5a1a43724a 100644
--- a/src/vs/platform/terminal/node/nodePtyHostStarter.ts
+++ b/src/vs/platform/terminal/node/nodePtyHostStarter.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { FileAccess } from 'vs/base/common/network';
+import { FileAccess, Schemas } from 'vs/base/common/network';
 import { Client, IIPCOptions } from 'vs/base/parts/ipc/node/ipc.cp';
 import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { parsePtyHostDebugPort } from 'vs/platform/environment/node/environmentService';
@@ -22,7 +22,7 @@ export class NodePtyHostStarter extends Disposable implements IPtyHostStarter {
 	start(): IPtyHostConnection {
 		const opts: IIPCOptions = {
 			serverName: 'Pty Host',
-			args: ['--type=ptyHost', '--logsPath', this._environmentService.logsHome.fsPath],
+			args: ['--type=ptyHost', '--logsPath', this._environmentService.logsHome.with({ scheme: Schemas.file }).fsPath],
 			env: {
 				VSCODE_AMD_ENTRYPOINT: 'vs/platform/terminal/node/ptyHostMain',
 				VSCODE_PIPE_LOGGING: 'true',
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index 022a20e4ee0..67d7113b000 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -1401,8 +1401,8 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 				profile: defaultProfile
 			},
 
-			homeDir: this.environmentMainService.userHome.fsPath,
-			tmpDir: this.environmentMainService.tmpDir.fsPath,
+			homeDir: this.environmentMainService.userHome.with({ scheme: Schemas.file }).fsPath,
+			tmpDir: this.environmentMainService.tmpDir.with({ scheme: Schemas.file }).fsPath,
 			userDataDir: this.environmentMainService.userDataPath,
 
 			remoteAuthority: options.remoteAuthority,
@@ -1419,7 +1419,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 				window: [],
 				global: this.loggerService.getRegisteredLoggers()
 			},
-			logsPath: this.environmentMainService.logsHome.fsPath,
+			logsPath: this.environmentMainService.logsHome.with({ scheme: Schemas.file }).fsPath,
 
 			product,
 			isInitialStartup: options.initialStartup,
diff --git a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
index 34913c5ffc5..1d482c3eba4 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
@@ -84,7 +84,7 @@ export class WorkspacesManagementMainService extends Disposable implements IWork
 
 		// Resolve untitled workspaces
 		try {
-			const untitledWorkspacePaths = (await Promises.readdir(this.untitledWorkspacesHome.fsPath)).map(folder => joinPath(this.untitledWorkspacesHome, folder, UNTITLED_WORKSPACE_NAME));
+			const untitledWorkspacePaths = (await Promises.readdir(this.untitledWorkspacesHome.with({ scheme: Schemas.file }).fsPath)).map(folder => joinPath(this.untitledWorkspacesHome, folder, UNTITLED_WORKSPACE_NAME));//
 			for (const untitledWorkspacePath of untitledWorkspacePaths) {
 				const workspace = getWorkspaceIdentifier(untitledWorkspacePath);
 				const resolvedWorkspace = await this.resolveLocalWorkspace(untitledWorkspacePath);
@@ -227,7 +227,7 @@ export class WorkspacesManagementMainService extends Disposable implements IWork
 			await Promises.rm(dirname(configPath));
 
 			// Mark Workspace Storage to be deleted
-			const workspaceStoragePath = join(this.environmentMainService.workspaceStorageHome.fsPath, workspace.id);
+			const workspaceStoragePath = join(this.environmentMainService.workspaceStorageHome.with({ scheme: Schemas.file }).fsPath, workspace.id);
 			if (await Promises.exists(workspaceStoragePath)) {
 				await Promises.writeFile(join(workspaceStoragePath, 'obsolete'), '');
 			}
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index d291af5dd1c..7e568185997 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -100,7 +100,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 	const logger = loggerService.createLogger('remoteagent', { name: localize('remoteExtensionLog', "Server") });
 	const logService = new LogService(logger, [new ServerLogger(getLogLevel(environmentService))]);
 	services.set(ILogService, logService);
-	setTimeout(() => cleanupOlderLogs(environmentService.logsHome.fsPath).then(null, err => logService.error(err)), 10000);
+	setTimeout(() => cleanupOlderLogs(environmentService.logsHome.with({ scheme: Schemas.file }).fsPath).then(null, err => logService.error(err)), 10000);
 	logService.onDidChangeLogLevel(logLevel => log(logService, logLevel, `Log level changed to ${LogLevelToString(logService.getLevel())}`));
 
 	logService.trace(`Remote configuration data at ${REMOTE_DATA_FOLDER}`);
diff --git a/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts b/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts
index eb3744a25a3..4f62c9c804c 100644
--- a/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts
+++ b/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts
@@ -15,7 +15,7 @@ export function revealResourcesInOS(resources: URI[], nativeHostService: INative
 	if (resources.length) {
 		sequence(resources.map(r => async () => {
 			if (r.scheme === Schemas.file || r.scheme === Schemas.vscodeUserData) {
-				nativeHostService.showItemInFolder(r.fsPath);
+				nativeHostService.showItemInFolder(r.with({ scheme: Schemas.file }).fsPath);
 			}
 		}));
 	} else if (workspaceContextService.getWorkspace().folders.length) {
diff --git a/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts b/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts
index 9ac4e2cd92f..20d20356e6e 100644
--- a/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts
+++ b/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts
@@ -39,7 +39,7 @@ registerAction2(class extends Action2 {
 
 		const { entry } = await findLocalHistoryEntry(workingCopyHistoryService, item);
 		if (entry) {
-			await nativeHostService.showItemInFolder(entry.location.fsPath);
+			await nativeHostService.showItemInFolder(entry.location.with({ scheme: Schemas.file }).fsPath);
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts b/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts
index 3a057d2b8b9..cbc2a01dbb5 100644
--- a/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts
+++ b/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts
@@ -9,6 +9,7 @@ import { INativeHostService } from 'vs/platform/native/common/native';
 import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
 import { IFileService } from 'vs/platform/files/common/files';
 import { joinPath } from 'vs/base/common/resources';
+import { Schemas } from 'vs/base/common/network';
 
 export class OpenLogsFolderAction extends Action {
 
@@ -23,7 +24,7 @@ export class OpenLogsFolderAction extends Action {
 	}
 
 	override run(): Promise<void> {
-		return this.nativeHostService.showItemInFolder(joinPath(this.environmentService.logsHome, 'main.log').fsPath);
+		return this.nativeHostService.showItemInFolder(joinPath(this.environmentService.logsHome, 'main.log').with({ scheme: Schemas.file }).fsPath);
 	}
 }
 
@@ -43,7 +44,7 @@ export class OpenExtensionLogsFolderAction extends Action {
 	override async run(): Promise<void> {
 		const folderStat = await this.fileService.resolve(this.environmentSerice.extHostLogsPath);
 		if (folderStat.children && folderStat.children[0]) {
-			return this.nativeHostService.showItemInFolder(folderStat.children[0].resource.fsPath);
+			return this.nativeHostService.showItemInFolder(folderStat.children[0].resource.with({ scheme: Schemas.file }).fsPath);
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts b/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts
index 644e1ad6dec..abbf3cfc882 100644
--- a/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts
+++ b/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts
@@ -17,6 +17,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { INativeHostService } from 'vs/platform/native/common/native';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { CONTEXT_SYNC_STATE, SYNC_TITLE } from 'vs/workbench/services/userDataSync/common/userDataSync';
+import { Schemas } from 'vs/base/common/network';
 
 class UserDataSyncServicesContribution implements IWorkbenchContribution {
 
@@ -51,7 +52,7 @@ registerAction2(class OpenSyncBackupsFolder extends Action2 {
 		if (await fileService.exists(syncHome)) {
 			const folderStat = await fileService.resolve(syncHome);
 			const item = folderStat.children && folderStat.children[0] ? folderStat.children[0].resource : syncHome;
-			return nativeHostService.showItemInFolder(item.fsPath);
+			return nativeHostService.showItemInFolder(item.with({ scheme: Schemas.file }).fsPath);
 		} else {
 			notificationService.info(localize('no backups', "Local backups folder does not exist"));
 		}

From 7545ee2ec46897d2b7ce3c6d591f636962455c9a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 1 Sep 2023 16:31:57 +0200
Subject: [PATCH 34/94] Creating a new empty editor group can leave focus in
 inactive group (fix #189256) (#191996)

---
 .../api/browser/mainThreadEditorTabs.ts       |  2 +-
 .../workbench/browser/parts/editor/editor.ts  |  4 +-
 .../browser/parts/editor/editorActions.ts     | 24 +++++++--
 .../browser/parts/editor/editorPart.ts        | 50 +++++++++----------
 .../browser/gettingStarted.ts                 |  3 +-
 .../editor/common/editorGroupsService.ts      |  7 +--
 .../test/browser/editorGroupsService.test.ts  |  3 +-
 .../test/browser/workbenchTestServices.ts     |  6 +--
 8 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
index f1d2d01597f..3da6c5ed51d 100644
--- a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
@@ -575,7 +575,7 @@ export class MainThreadEditorTabs implements MainThreadEditorTabsShape {
 			if (viewColumn === SIDE_GROUP) {
 				direction = preferredSideBySideGroupDirection(this._configurationService);
 			}
-			targetGroup = this._editorGroupsService.addGroup(this._editorGroupsService.groups[this._editorGroupsService.groups.length - 1], direction, undefined);
+			targetGroup = this._editorGroupsService.addGroup(this._editorGroupsService.groups[this._editorGroupsService.groups.length - 1], direction);
 		} else {
 			targetGroup = this._editorGroupsService.getGroup(groupId);
 		}
diff --git a/src/vs/workbench/browser/parts/editor/editor.ts b/src/vs/workbench/browser/parts/editor/editor.ts
index 68f64a44162..23f3371411a 100644
--- a/src/vs/workbench/browser/parts/editor/editor.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.ts
@@ -5,7 +5,7 @@
 
 import { GroupIdentifier, IWorkbenchEditorConfiguration, IEditorIdentifier, IEditorCloseEvent, IEditorPartOptions, IEditorPartOptionsChangeEvent, SideBySideEditor, EditorCloseContext } from 'vs/workbench/common/editor';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { IEditorGroup, GroupDirection, IAddGroupOptions, IMergeGroupOptions, GroupsOrder, GroupsArrangement } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorGroup, GroupDirection, IMergeGroupOptions, GroupsOrder, GroupsArrangement } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Dimension } from 'vs/base/browser/dom';
 import { Event } from 'vs/base/common/event';
@@ -96,7 +96,7 @@ export interface IEditorGroupsAccessor {
 	activateGroup(identifier: IEditorGroupView | GroupIdentifier): IEditorGroupView;
 	restoreGroup(identifier: IEditorGroupView | GroupIdentifier): IEditorGroupView;
 
-	addGroup(location: IEditorGroupView | GroupIdentifier, direction: GroupDirection, options?: IAddGroupOptions): IEditorGroupView;
+	addGroup(location: IEditorGroupView | GroupIdentifier, direction: GroupDirection): IEditorGroupView;
 	mergeGroup(group: IEditorGroupView | GroupIdentifier, target: IEditorGroupView | GroupIdentifier, options?: IMergeGroupOptions): IEditorGroupView;
 
 	moveGroup(group: IEditorGroupView | GroupIdentifier, location: IEditorGroupView | GroupIdentifier, direction: GroupDirection): IEditorGroupView;
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index e13b41e522f..bcb01677992 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -2263,13 +2263,27 @@ abstract class AbstractCreateEditorGroupAction extends Action2 {
 
 	override async run(accessor: ServicesAccessor): Promise<void> {
 		const editorGroupService = accessor.get(IEditorGroupsService);
+		const layoutService = accessor.get(IWorkbenchLayoutService);
 
-		// We intentionally do not want the new group to be focussed so that
-		// a user can have keyboard focus e.g. in a tree/list, open a new
-		// editor group that is active and then arrow-up/down in the tree/list
-		// to pick an editor to open in that group
+		// We are about to create a new empty editor group. We make an opiniated
+		// decision here whether to focus that new editor group or not based
+		// on what is currently focused. If focus is outside the editor area not
+		// in the <body>, we do not focus, with the rationale that a user might
+		// have focus on a tree/list with the intention to pick an element to
+		// open in the new group from that tree/list.
+		//
+		// If focus is inside the editor area, we want to prevent the situation
+		// of an editor having keyboard focus in an inactive editor group
+		// (see https://github.com/microsoft/vscode/issues/189256)
 
-		editorGroupService.addGroup(editorGroupService.activeGroup, this.direction, { activate: true });
+		const focusNewGroup = layoutService.hasFocus(Parts.EDITOR_PART) || document.activeElement === document.body;
+
+		const group = editorGroupService.addGroup(editorGroupService.activeGroup, this.direction);
+		editorGroupService.activateGroup(group);
+
+		if (focusNewGroup) {
+			group.focus();
+		}
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 8b733caa867..af10ae9c109 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -8,7 +8,7 @@ import { Part } from 'vs/workbench/browser/part';
 import { Dimension, isAncestor, $, EventHelper, addDisposableGenericMouseDownListener } from 'vs/base/browser/dom';
 import { Event, Emitter, Relay } from 'vs/base/common/event';
 import { contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { GroupDirection, IAddGroupOptions, GroupsArrangement, GroupOrientation, IMergeGroupOptions, MergeGroupMode, GroupsOrder, GroupLocation, IFindGroupScope, EditorGroupLayout, GroupLayoutArgument, IEditorGroupsService, IEditorSideGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { GroupDirection, GroupsArrangement, GroupOrientation, IMergeGroupOptions, MergeGroupMode, GroupsOrder, GroupLocation, IFindGroupScope, EditorGroupLayout, GroupLayoutArgument, IEditorGroupsService, IEditorSideGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IView, orthogonal, LayoutPriority, IViewSize, Direction, SerializableGrid, Sizing, ISerializedGrid, ISerializedNode, Orientation, GridBranchNode, isGridBranchNode, GridNode, createSerializedGrid, Grid } from 'vs/base/browser/ui/grid/grid';
 import { GroupIdentifier, EditorInputWithOptions, IEditorPartOptions, IEditorPartOptionsChangeEvent, GroupModelChangeKind } from 'vs/workbench/common/editor';
@@ -328,7 +328,6 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
 		const groupView = this.assertGroupView(group);
 		this.doSetGroupActive(groupView);
 
-		this._onDidActivateGroup.fire(groupView);
 		return groupView;
 	}
 
@@ -512,17 +511,13 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
 		return false;
 	}
 
-	addGroup(location: IEditorGroupView | GroupIdentifier, direction: GroupDirection, options?: IAddGroupOptions): IEditorGroupView {
+	addGroup(location: IEditorGroupView | GroupIdentifier, direction: GroupDirection): IEditorGroupView {
 		const locationView = this.assertGroupView(location);
 
 		const restoreFocus = this.shouldRestoreFocus(locationView.element);
 
 		const group = this.doAddGroup(locationView, direction);
 
-		if (options?.activate) {
-			this.doSetGroupActive(group);
-		}
-
 		// Restore focus if we had it previously after completing the grid
 		// operation. That operation might cause reparenting of grid views
 		// which moves focus to the <body> element otherwise.
@@ -622,27 +617,30 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
 	}
 
 	private doSetGroupActive(group: IEditorGroupView): void {
-		if (this._activeGroup === group) {
-			return; // return if this is already the active group
+		if (this._activeGroup !== group) {
+			const previousActiveGroup = this._activeGroup;
+			this._activeGroup = group;
+
+			// Update list of most recently active groups
+			this.doUpdateMostRecentActive(group, true);
+
+			// Mark previous one as inactive
+			previousActiveGroup?.setActive(false);
+
+			// Mark group as new active
+			group.setActive(true);
+
+			// Maximize the group if it is currently minimized
+			this.doRestoreGroup(group);
+
+			// Event
+			this._onDidChangeActiveGroup.fire(group);
 		}
 
-		const previousActiveGroup = this._activeGroup;
-		this._activeGroup = group;
-
-		// Update list of most recently active groups
-		this.doUpdateMostRecentActive(group, true);
-
-		// Mark previous one as inactive
-		previousActiveGroup?.setActive(false);
-
-		// Mark group as new active
-		group.setActive(true);
-
-		// Maximize the group if it is currently minimized
-		this.doRestoreGroup(group);
-
-		// Event
-		this._onDidChangeActiveGroup.fire(group);
+		// Always fire the event that a group has been activated
+		// even if its the same group that is already active to
+		// signal the intent even when nothing has changed.
+		this._onDidActivateGroup.fire(group);
 	}
 
 	private doRestoreGroup(group: IEditorGroupView): void {
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
index 04283236ddd..d42c329a868 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -1229,7 +1229,8 @@ export class GettingStartedPage extends EditorPane {
 
 		if (toSide && fullSize.width > 700) {
 			if (this.groupsService.count === 1) {
-				this.groupsService.addGroup(this.groupsService.groups[0], GroupDirection.RIGHT, { activate: true });
+				const sideGroup = this.groupsService.addGroup(this.groupsService.groups[0], GroupDirection.RIGHT);
+				this.groupsService.activateGroup(sideGroup);
 
 				const gettingStartedSize = Math.floor(fullSize.width / 2);
 
diff --git a/src/vs/workbench/services/editor/common/editorGroupsService.ts b/src/vs/workbench/services/editor/common/editorGroupsService.ts
index e2021cc43ad..12a0b1cab6f 100644
--- a/src/vs/workbench/services/editor/common/editorGroupsService.ts
+++ b/src/vs/workbench/services/editor/common/editorGroupsService.ts
@@ -91,10 +91,6 @@ export interface EditorGroupLayout {
 	groups: GroupLayoutArgument[];
 }
 
-export interface IAddGroupOptions {
-	activate?: boolean;
-}
-
 export const enum MergeGroupMode {
 	COPY_EDITORS,
 	MOVE_EDITORS
@@ -364,9 +360,8 @@ export interface IEditorGroupsService {
 	 *
 	 * @param location the group from which to split to add a new group
 	 * @param direction the direction of where to split to
-	 * @param options configure the newly group with options
 	 */
-	addGroup(location: IEditorGroup | GroupIdentifier, direction: GroupDirection, options?: IAddGroupOptions): IEditorGroup;
+	addGroup(location: IEditorGroup | GroupIdentifier, direction: GroupDirection): IEditorGroup;
 
 	/**
 	 * Remove a group from the editor area.
diff --git a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
index 24f173d1c66..e05cee676fc 100644
--- a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
@@ -320,7 +320,8 @@ suite('EditorGroupsService', () => {
 		const input = new TestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
 
 		await rootGroup.openEditor(input, { pinned: true });
-		const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT, { activate: true });
+		const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT);
+		part.activateGroup(rightGroup);
 		const downGroup = part.copyGroup(rootGroup, rightGroup, GroupDirection.DOWN);
 		assert.strictEqual(groupAddedCounter, 2);
 		assert.strictEqual(downGroup.count, 1);
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index c566bc46401..ed87b23c2ba 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -52,7 +52,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IDecorationsService, IResourceDecorationChangeEvent, IDecoration, IDecorationData, IDecorationsProvider } from 'vs/workbench/services/decorations/common/decorations';
 import { IDisposable, toDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IAddGroupOptions, IMergeGroupOptions, IEditorReplacement, IFindGroupScope, EditorGroupLayout, ICloseEditorOptions, GroupOrientation, ICloseAllEditorsOptions, ICloseEditorsFilter } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IMergeGroupOptions, IEditorReplacement, IFindGroupScope, EditorGroupLayout, ICloseEditorOptions, GroupOrientation, ICloseAllEditorsOptions, ICloseEditorsFilter } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService, ISaveEditorsOptions, IRevertAllEditorsOptions, PreferredGroup, IEditorsChangeEvent, ISaveEditorsResult } from 'vs/workbench/services/editor/common/editorService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IEditorPaneRegistry, EditorPaneDescriptor } from 'vs/workbench/browser/editor';
@@ -848,7 +848,7 @@ export class TestEditorGroupsService implements IEditorGroupsService {
 	applyLayout(_layout: EditorGroupLayout): void { }
 	getLayout(): EditorGroupLayout { throw new Error('not implemented'); }
 	setGroupOrientation(_orientation: GroupOrientation): void { }
-	addGroup(_location: number | IEditorGroup, _direction: GroupDirection, _options?: IAddGroupOptions): IEditorGroup { throw new Error('not implemented'); }
+	addGroup(_location: number | IEditorGroup, _direction: GroupDirection): IEditorGroup { throw new Error('not implemented'); }
 	removeGroup(_group: number | IEditorGroup): void { }
 	moveGroup(_group: number | IEditorGroup, _location: number | IEditorGroup, _direction: GroupDirection): IEditorGroup { throw new Error('not implemented'); }
 	mergeGroup(_group: number | IEditorGroup, _target: number | IEditorGroup, _options?: IMergeGroupOptions): IEditorGroup { throw new Error('not implemented'); }
@@ -946,7 +946,7 @@ export class TestEditorGroupAccessor implements IEditorGroupsAccessor {
 	getGroups(order: GroupsOrder): IEditorGroupView[] { throw new Error('Method not implemented.'); }
 	activateGroup(identifier: number | IEditorGroupView): IEditorGroupView { throw new Error('Method not implemented.'); }
 	restoreGroup(identifier: number | IEditorGroupView): IEditorGroupView { throw new Error('Method not implemented.'); }
-	addGroup(location: number | IEditorGroupView, direction: GroupDirection, options?: IAddGroupOptions | undefined): IEditorGroupView { throw new Error('Method not implemented.'); }
+	addGroup(location: number | IEditorGroupView, direction: GroupDirection): IEditorGroupView { throw new Error('Method not implemented.'); }
 	mergeGroup(group: number | IEditorGroupView, target: number | IEditorGroupView, options?: IMergeGroupOptions | undefined): IEditorGroupView { throw new Error('Method not implemented.'); }
 	moveGroup(group: number | IEditorGroupView, location: number | IEditorGroupView, direction: GroupDirection): IEditorGroupView { throw new Error('Method not implemented.'); }
 	copyGroup(group: number | IEditorGroupView, location: number | IEditorGroupView, direction: GroupDirection): IEditorGroupView { throw new Error('Method not implemented.'); }

From 9ee5a2123dc1ef1e407c499aac1c296ba03eb1c4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 1 Sep 2023 16:37:19 +0200
Subject: [PATCH 35/94] [Accessibility] Consider providing the default
 keybinding for notifications.showList (fix #191784) (#191997)

---
 .../parts/notifications/notificationsCommands.ts   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
index 52910366b5f..6d02c45b4ca 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
@@ -6,7 +6,7 @@
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { INotificationViewItem, isNotificationViewItem, NotificationsModel } from 'vs/workbench/common/notifications';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { localize } from 'vs/nls';
@@ -90,9 +90,15 @@ export function getNotificationFromContext(listService: IListService, context?:
 export function registerNotificationCommands(center: INotificationsCenterController, toasts: INotificationsToastController, model: NotificationsModel): void {
 
 	// Show Notifications Cneter
-	CommandsRegistry.registerCommand(SHOW_NOTIFICATIONS_CENTER, () => {
-		toasts.hide();
-		center.show();
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: SHOW_NOTIFICATIONS_CENTER,
+		weight: KeybindingWeight.WorkbenchContrib,
+		when: NotificationsCenterVisibleContext.negate(),
+		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyN),
+		handler: () => {
+			toasts.hide();
+			center.show();
+		}
 	});
 
 	// Hide Notifications Center

From 37390a84c6bf3a7118bb9c9618e5ad402919dc28 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 1 Sep 2023 16:40:31 +0200
Subject: [PATCH 36/94] editors - call `focus` before `activate` to preserve
 activation (#191991)

---
 src/vs/workbench/browser/parts/editor/editorPart.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index af10ae9c109..d8250c91f15 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -525,6 +525,10 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
 			locationView.focus();
 		}
 
+		if (options?.activate) {
+			this.doSetGroupActive(group);
+		}
+
 		return group;
 	}
 

From 14555a512349eb06555e5ae78384bd1fc46ea2e5 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 1 Sep 2023 16:40:42 +0200
Subject: [PATCH 37/94] app - ensure to remove `windowId=_blank` from protocol
 links (fix #191902) (#191990)

---
 src/vs/code/electron-main/app.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index c6536298e05..49f3c2703cd 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -774,7 +774,17 @@ export class CodeApplication extends Disposable {
 			if (secondSlash !== -1) {
 				const authority = uri.path.substring(1, secondSlash);
 				const path = uri.path.substring(secondSlash);
-				const remoteUri = URI.from({ scheme: Schemas.vscodeRemote, authority, path, query: uri.query, fragment: uri.fragment });
+
+				let query = uri.query;
+				const params = new URLSearchParams(uri.query);
+				if (params.get('windowId') === '_blank') {
+					// Make sure to unset any `windowId=_blank` here
+					// https://github.com/microsoft/vscode/issues/191902
+					params.delete('windowId');
+					query = params.toString();
+				}
+
+				const remoteUri = URI.from({ scheme: Schemas.vscodeRemote, authority, path, query, fragment: uri.fragment });
 
 				if (hasWorkspaceFileExtension(path)) {
 					return { workspaceUri: remoteUri };

From be570fd3de6ecf0935a6d8e188e4a47ae457448d Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 1 Sep 2023 16:40:56 +0200
Subject: [PATCH 38/94] Git - Bump which package (#191992)

---
 extensions/git/package.json |  2 +-
 extensions/git/yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 37212410bfe..9ad1978be0e 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3012,7 +3012,7 @@
     "jschardet": "3.0.0",
     "picomatch": "2.3.1",
     "vscode-uri": "^2.0.0",
-    "which": "3.0.1"
+    "which": "4.0.0"
   },
   "devDependencies": {
     "@types/byline": "4.2.31",
diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock
index bb3a09d947c..0b62d7472be 100644
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@@ -516,10 +516,10 @@ is-core-module@^2.13.0:
   dependencies:
     has "^1.0.3"
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+isexe@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
+  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
 
 jschardet@3.0.0:
   version "3.0.0"
@@ -679,12 +679,12 @@ vscode-uri@^2.0.0:
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.0.tgz#2df704222f72b8a71ff266ba0830ed6c51ac1542"
   integrity sha512-lWXWofDSYD8r/TIyu64MdwB4FaSirQ608PP/TzUyslyOeHGwQ0eTHUZeJrK1ILOmwUHaJtV693m2JoUYroUDpw==
 
-which@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-3.0.1.tgz#89f1cd0c23f629a8105ffe69b8172791c87b4be1"
-  integrity sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==
+which@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
+  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
   dependencies:
-    isexe "^2.0.0"
+    isexe "^3.1.1"
 
 yallist@^4.0.0:
   version "4.0.0"

From 04f02b504323d91a2eed9d827163b713a1a47859 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Fri, 1 Sep 2023 16:53:04 +0200
Subject: [PATCH 39/94] fix https://github.com/microsoft/vscode/issues/191908

---
 .../codelens/browser/codelensController.ts    | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/vs/editor/contrib/codelens/browser/codelensController.ts b/src/vs/editor/contrib/codelens/browser/codelensController.ts
index 4fd3619fb51..da810c9a099 100644
--- a/src/vs/editor/contrib/codelens/browser/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelensController.ts
@@ -232,6 +232,9 @@ export class CodeLensContribution implements IEditorContribution {
 		this._localToDispose.add(this._editor.onDidFocusEditorWidget(() => {
 			scheduler.schedule();
 		}));
+		this._localToDispose.add(this._editor.onDidBlurEditorText(() => {
+			scheduler.cancel();
+		}));
 		this._localToDispose.add(this._editor.onDidScrollChange(e => {
 			if (e.scrollTopChanged && this._lenses.length > 0) {
 				this._resolveCodeLensesInViewportSoon();
@@ -444,8 +447,12 @@ export class CodeLensContribution implements IEditorContribution {
 		});
 	}
 
-	getModel(): CodeLensModel | undefined {
-		return this._currentCodeLensModel;
+	async getModel(): Promise<CodeLensModel | undefined> {
+		await this._getCodeLensModelPromise;
+		await this._resolveCodeLensesPromise;
+		return !this._currentCodeLensModel?.isDisposed
+			? this._currentCodeLensModel
+			: undefined;
 	}
 }
 
@@ -478,7 +485,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
 			return;
 		}
 
-		const model = codelensController.getModel();
+		const model = await codelensController.getModel();
 		if (!model) {
 			// nothing
 			return;
@@ -499,19 +506,31 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
 			return;
 		}
 
-		const item = await quickInputService.pick(items, { canPickMany: false });
+		const item = await quickInputService.pick(items, {
+			canPickMany: false,
+			placeHolder: localize('placeHolder', "Select a command")
+		});
 		if (!item) {
 			// Nothing picked
 			return;
 		}
 
+		let command = item.command;
+
 		if (model.isDisposed) {
-			// retry whenever the model has been disposed
-			return await commandService.executeCommand(this.id);
+			// try to find the same command again in-case the model has been re-created in the meantime
+			// this is a best attempt approach which shouldn't be needed because eager model re-creates
+			// shouldn't happen due to focus in/out anymore
+			const newModel = await codelensController.getModel();
+			const newLens = newModel?.lenses.find(lens => lens.symbol.range.startLineNumber === lineNumber && lens.symbol.command?.title === command.title);
+			if (!newLens || !newLens.symbol.command) {
+				return;
+			}
+			command = newLens.symbol.command;
 		}
 
 		try {
-			await commandService.executeCommand(item.command.id, ...(item.command.arguments || []));
+			await commandService.executeCommand(command.id, ...(command.arguments || []));
 		} catch (err) {
 			notificationService.error(err);
 		}

From 812643de4b3679950a4e92bb19f3f2bb9c08bab4 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Fri, 1 Sep 2023 17:45:32 +0200
Subject: [PATCH 40/94] comment out not-compiling code, fyi @bpasero

---
 src/vs/workbench/browser/parts/editor/editorPart.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index d8250c91f15..0f868b4ad97 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -525,9 +525,9 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
 			locationView.focus();
 		}
 
-		if (options?.activate) {
-			this.doSetGroupActive(group);
-		}
+		// if (options?.activate) {
+		// 	this.doSetGroupActive(group);
+		// }
 
 		return group;
 	}

From c8edc8cb2cae1871eab8ae2220c09faf77054cbb Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Fri, 1 Sep 2023 18:05:27 +0200
Subject: [PATCH 41/94] fix https://github.com/microsoft/vscode/issues/187779

---
 .../contrib/suggest/browser/suggestModel.ts   |  6 ++++
 .../test/browser/suggestController.test.ts    | 35 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/vs/editor/contrib/suggest/browser/suggestModel.ts b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
index fd8d533f594..c4e44699449 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
@@ -635,6 +635,12 @@ export class SuggestModel implements IDisposable {
 			return;
 		}
 
+		if (!ctx.leadingLineContent.startsWith(this._context.leadingLineContent) && !this._context.leadingLineContent.startsWith(ctx.leadingLineContent)) {
+			// e.g. happens when line prefix changes, e.g delete while suggest is showing
+			this.cancel();
+			return;
+		}
+
 		if (getLeadingWhitespace(ctx.leadingLineContent) !== getLeadingWhitespace(this._context.leadingLineContent)) {
 			// cancel IntelliSense when line start changes
 			// happens when the current word gets outdented
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
index f37f02ac646..bbb32d3fe37 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
@@ -32,6 +32,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { DeleteLinesAction } from 'vs/editor/contrib/linesOperations/browser/linesOperations';
 
 suite('SuggestController', function () {
 
@@ -579,4 +580,38 @@ suite('SuggestController', function () {
 		controller.acceptSelectedSuggestion(false, false);
 		assert.strictEqual(editor.getValue(), 'for');
 	});
+
+	test('Suggest widget gets orphaned in editor #187779', async function () {
+
+		disposables.add(languageFeaturesService.completionProvider.register({ scheme: 'test-ctrl' }, {
+			_debugDisplayName: 'test',
+			provideCompletionItems(doc, pos) {
+
+				const word = doc.getLineContent(pos.lineNumber);
+				const range = new Range(pos.lineNumber, 1, pos.lineNumber, pos.column);
+
+				return {
+					suggestions: [{
+						kind: CompletionItemKind.Text,
+						label: word,
+						insertText: word,
+						range
+					}]
+				};
+			}
+		}));
+
+		editor.setValue(`console.log(example.)\nconsole.log(EXAMPLE.not)`);
+		editor.setSelection(new Selection(1, 21, 1, 21));
+
+		const p1 = Event.toPromise(controller.model.onDidSuggest);
+		controller.triggerSuggest();
+
+		await p1;
+
+		const p2 = Event.toPromise(controller.model.onDidCancel);
+		new DeleteLinesAction().run(null!, editor);
+
+		await p2;
+	});
 });

From a8b8e3a143bfb1530b373af80db47e2424c00897 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 1 Sep 2023 09:38:20 -0700
Subject: [PATCH 42/94] forwarding: fix log format again (#191941)

Fixes #191759
---
 cli/src/log.rs                                |  4 ++--
 extensions/tunnel-forwarding/src/extension.ts | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cli/src/log.rs b/cli/src/log.rs
index a7561a37f6c..1180f2c82c2 100644
--- a/cli/src/log.rs
+++ b/cli/src/log.rs
@@ -323,8 +323,8 @@ fn format(level: Level, prefix: &str, message: &str, use_colors: bool) -> String
 }
 
 pub fn emit(level: Level, prefix: &str, message: &str) {
-	let line = format(level, prefix, message, true);
-	if level == Level::Trace {
+	let line = format(level, prefix, message, *COLORS_ENABLED);
+	if level == Level::Trace && *COLORS_ENABLED {
 		print!("\x1b[2m{}\x1b[0m", line);
 	} else {
 		print!("{}", line);
diff --git a/extensions/tunnel-forwarding/src/extension.ts b/extensions/tunnel-forwarding/src/extension.ts
index 83789934df5..f6ef85e71b1 100644
--- a/extensions/tunnel-forwarding/src/extension.ts
+++ b/extensions/tunnel-forwarding/src/extension.ts
@@ -231,8 +231,8 @@ class TunnelProvider implements vscode.TunnelProvider {
 		];
 
 		this.logger.log('info', '[forwarding] starting CLI');
-		const process = spawn(cliPath, args, { stdio: 'pipe' });
-		this.state = { state: State.Starting, process };
+		const child = spawn(cliPath, args, { stdio: 'pipe', env: { ...process.env, NO_COLOR: '1' } });
+		this.state = { state: State.Starting, process: child };
 
 		const progressP = new DeferredPromise<void>();
 		vscode.window.withProgress(
@@ -248,29 +248,29 @@ class TunnelProvider implements vscode.TunnelProvider {
 		);
 
 		let lastPortFormat: string | undefined;
-		process.on('exit', status => {
+		child.on('exit', status => {
 			const msg = `[forwarding] exited with code ${status}`;
 			this.logger.log('info', msg);
 			progressP.complete(); // make sure to clear progress on unexpected exit
-			if (this.isInStateWithProcess(process)) {
+			if (this.isInStateWithProcess(child)) {
 				this.state = { state: State.Error, error: msg };
 			}
 		});
 
-		process.on('error', err => {
+		child.on('error', err => {
 			this.logger.log('error', `[forwarding] ${err}`);
 			progressP.complete(); // make sure to clear progress on unexpected exit
-			if (this.isInStateWithProcess(process)) {
+			if (this.isInStateWithProcess(child)) {
 				this.state = { state: State.Error, error: String(err) };
 			}
 		});
 
-		process.stdout
+		child.stdout
 			.pipe(splitNewLines())
 			.on('data', line => this.logger.log('info', `[forwarding] ${line}`))
 			.resume();
 
-		process.stderr
+		child.stderr
 			.pipe(splitNewLines())
 			.on('data', line => {
 				try {
@@ -278,7 +278,7 @@ class TunnelProvider implements vscode.TunnelProvider {
 					if (l.port_format && l.port_format !== lastPortFormat) {
 						this.state = {
 							state: State.Active,
-							portFormat: l.port_format, process,
+							portFormat: l.port_format, process: child,
 							cleanupTimeout: 'cleanupTimeout' in this.state ? this.state.cleanupTimeout : undefined,
 						};
 						progressP.complete();
@@ -290,8 +290,8 @@ class TunnelProvider implements vscode.TunnelProvider {
 			.resume();
 
 		await new Promise((resolve, reject) => {
-			process.on('spawn', resolve);
-			process.on('error', reject);
+			child.on('spawn', resolve);
+			child.on('error', reject);
 		});
 	}
 }

From 55b37e271d882fe28b41de79f0a6381ffd15112e Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Fri, 1 Sep 2023 10:02:14 -0700
Subject: [PATCH 43/94] Bump distro (#192006)

for the removal of semantic similarity.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1f473f744fc..4a0405868b6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.83.0",
-  "distro": "0a5805caff2d59440704a3bf75eebaa509be862f",
+  "distro": "46e7bb69af9f06de037c3d7e8f61de4a679f9ef1",
   "author": {
     "name": "Microsoft Corporation"
   },

From 2d502be79d044ed34fcea16eeb02cf98b789789c Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 1 Sep 2023 10:27:03 -0700
Subject: [PATCH 44/94] testing: compress single test messages in the Test
 Results tree view (#192011)

Fixes #192010
---
 .../testing/browser/testingOutputPeek.ts      | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
index 6223c1c211f..f5e1fce889c 100644
--- a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
@@ -78,7 +78,6 @@ import { DetachedProcessInfo } from 'vs/workbench/contrib/terminal/browser/detac
 import { IDetachedTerminalInstance, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { getXtermScaledDimensions } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
 import { TERMINAL_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { flatTestItemDelimiter } from 'vs/workbench/contrib/testing/browser/explorerProjections/display';
 import { getTestItemContextOverlay } from 'vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay';
 import * as icons from 'vs/workbench/contrib/testing/browser/icons';
 import { testingPeekBorder, testingPeekHeaderBackground } from 'vs/workbench/contrib/testing/browser/theme';
@@ -1704,15 +1703,7 @@ class TestCaseElement implements ITreeElement {
 		private readonly task: ITestRunTask,
 		public readonly test: TestResultItem,
 		public readonly taskIndex: number,
-	) {
-		for (const parent of resultItemParents(results, test)) {
-			if (parent !== test) {
-				this.description = this.description
-					? parent.item.label + flatTestItemDelimiter + this.description
-					: parent.item.label;
-			}
-		}
-	}
+	) { }
 }
 
 class TaskElement implements ITreeElement {
@@ -1871,7 +1862,7 @@ class OutputPeekTree extends Disposable {
 			return test.tasks[taskIndex].messages
 				.map((m, messageIndex) =>
 					m.type === TestMessageType.Error
-						? { element: cc.getOrCreate(m, () => new TestMessageElement(result, test, taskIndex, messageIndex)), incompressible: true }
+						? { element: cc.getOrCreate(m, () => new TestMessageElement(result, test, taskIndex, messageIndex)), incompressible: false }
 						: undefined
 				)
 				.filter(isDefined);
@@ -2103,8 +2094,8 @@ class TestRunElementRenderer implements ICompressibleTreeRenderer<ITreeElement,
 	public renderCompressedElements(node: ITreeNode<ICompressedTreeNode<ITreeElement>, FuzzyScore>, _index: number, templateData: TemplateData): void {
 		const chain = node.element.elements;
 		const lastElement = chain[chain.length - 1];
-		if (lastElement instanceof TaskElement && chain.length >= 2) {
-			this.doRender(chain[chain.length - 2], templateData);
+		if ((lastElement instanceof TaskElement || lastElement instanceof TestMessageElement) && chain.length >= 2) {
+			this.doRender(chain[chain.length - 2], templateData, lastElement);
 		} else {
 			this.doRender(lastElement, templateData);
 		}
@@ -2148,20 +2139,26 @@ class TestRunElementRenderer implements ICompressibleTreeRenderer<ITreeElement,
 	}
 
 	/** Called to render a new element */
-	private doRender(element: ITreeElement, templateData: TemplateData) {
+	private doRender(element: ITreeElement, templateData: TemplateData, subjectElement?: ITreeElement) {
 		templateData.elementDisposable.clear();
-		templateData.elementDisposable.add(element.onDidChange(() => this.doRender(element, templateData)));
-		this.doRenderInner(element, templateData);
+		templateData.elementDisposable.add(
+			element.onDidChange(() => this.doRender(element, templateData, subjectElement)),
+		);
+		this.doRenderInner(element, templateData, subjectElement);
 	}
 
 	/** Called, and may be re-called, to render or re-render an element */
-	private doRenderInner(element: ITreeElement, templateData: TemplateData) {
-		if (element.labelWithIcons) {
-			dom.reset(templateData.label, ...element.labelWithIcons);
-		} else if (element.description) {
-			dom.reset(templateData.label, element.label, dom.$('span.test-label-description', {}, element.description));
+	private doRenderInner(element: ITreeElement, templateData: TemplateData, subjectElement: ITreeElement | undefined) {
+		let { label, labelWithIcons, description } = element;
+		if (subjectElement instanceof TestMessageElement) {
+			description = subjectElement.label;
+		}
+
+		const descriptionElement = description ? dom.$('span.test-label-description', {}, description) : '';
+		if (labelWithIcons) {
+			dom.reset(templateData.label, ...labelWithIcons, descriptionElement);
 		} else {
-			dom.reset(templateData.label, element.label);
+			dom.reset(templateData.label, label, descriptionElement);
 		}
 
 		const icon = element.icon;

From 81302a437b5a5ed7ce0c88e9a0a3fc5eaf6e34b4 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 1 Sep 2023 12:45:28 -0700
Subject: [PATCH 45/94] fix additional leak, comment out detector for now

---
 .../widget/diffEditorWidget2/outlineModel.ts  |  1 +
 .../test/browser/inlineChatController.test.ts | 30 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/outlineModel.ts b/src/vs/editor/browser/widget/diffEditorWidget2/outlineModel.ts
index cd12277b82c..8732bb7f0e6 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/outlineModel.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/outlineModel.ts
@@ -231,6 +231,7 @@ export class OutlineModel extends TreeElement {
 				return result._compact();
 			}
 		}).finally(() => {
+			cts.dispose();
 			listener.dispose();
 		});
 	}
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
index 476dfbe33db..0290893971c 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -4,31 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { equals } from 'vs/base/common/arrays';
+import { Emitter, Event } from 'vs/base/common/event';
 import { DisposableStore } from 'vs/base/common/lifecycle';
+import { mock } from 'vs/base/test/common/mock';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { Range } from 'vs/editor/common/core/range';
+import { ITextModel } from 'vs/editor/common/model';
+import { IModelService } from 'vs/editor/common/services/model';
 import { instantiateTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
+import { IEditorProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
+import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
+import { IChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/chat';
+import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { InlineChatController, InlineChatRunOptions, State } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { IInlineChatSessionService, InlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { IInlineChatService, InlineChatResponseType } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { InlineChatServiceImpl } from 'vs/workbench/contrib/inlineChat/common/inlineChatServiceImpl';
 import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ITextModel } from 'vs/editor/common/model';
-import { IEditorProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
-import { mock } from 'vs/base/test/common/mock';
-import { Emitter, Event } from 'vs/base/common/event';
-import { equals } from 'vs/base/common/arrays';
-import { IChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/chat';
-import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
-import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('InteractiveChatController', function () {
 
@@ -146,7 +145,8 @@ suite('InteractiveChatController', function () {
 		ctrl?.dispose();
 	});
 
-	ensureNoDisposablesAreLeakedInTestSuite();
+	// todo: re-enable this when earlier tests are fixed
+	// ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('creation, not showing anything', function () {
 		for (let deadline = Date.now() + 1000; Date.now() < deadline;) { }

From 0ee7a576b6c2e252266a392cac6d9c9be7b3a1d0 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 1 Sep 2023 13:17:58 -0700
Subject: [PATCH 46/94] tunnels: fix command prompt windows show up on windows
 machine (#192016)

Fixes #190425
---
 cli/src/tunnels/control_server.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cli/src/tunnels/control_server.rs b/cli/src/tunnels/control_server.rs
index 6f8c1060e1f..45e0c9748ef 100644
--- a/cli/src/tunnels/control_server.rs
+++ b/cli/src/tunnels/control_server.rs
@@ -1021,6 +1021,9 @@ where
 		p.current_dir(cwd);
 	}
 
+	#[cfg(target_os = "windows")]
+	p.creation_flags(winapi::um::winbase::CREATE_NO_WINDOW);
+
 	let mut p = p.spawn().map_err(CodeError::ProcessSpawnFailed)?;
 
 	let futs = FuturesUnordered::new();

From a6808a1534469d4cb2f52e70fedef7fcbf92e1f8 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 1 Sep 2023 13:18:17 -0700
Subject: [PATCH 47/94] testing: fix text centering in filter (#192017)

Fixes #182648
---
 .../workbench/contrib/testing/browser/testingExplorerFilter.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts
index c577c7ba942..05be7da398c 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts
@@ -135,7 +135,7 @@ export class TestingExplorerFilter extends BaseActionViewItem {
 	public layout(width: number) {
 		this.input.layout(new dom.Dimension(
 			width - /* horizontal padding */ 24 - /* editor padding */ 8 - /* filter button padding */ 22,
-			/* line height */ 27 - /* editor padding */ 4,
+			20, // line height from suggestEnabledInput.ts
 		));
 	}
 

From 3519b130fbbd41281980d726dae3ca964305b329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E8=89=AF?= <1204183885@qq.com>
Date: Sat, 2 Sep 2023 04:47:01 +0800
Subject: [PATCH 48/94] fix: Close #191880,  Repair command cannot be searched
 by keyword after localization (#191953)

---
 .../api/browser/mainThreadComments.ts         |  4 +-
 .../api/browser/viewsExtensionPoint.ts        |  3 +-
 .../test/browser/mainThreadTreeViews.test.ts  |  2 +-
 src/vs/workbench/common/views.ts              |  2 +-
 .../browser/preview/bulkEdit.contribution.ts  |  2 +-
 .../browser/chatContributionServiceImpl.ts    |  2 +-
 .../comments/browser/commentsTreeViewer.ts    |  1 +
 .../test/browser/commentsView.test.ts         |  2 +-
 .../debug/browser/debug.contribution.ts       |  2 +-
 .../browser/editSessions.contribution.ts      |  4 +-
 .../editSessions/common/editSessions.ts       |  1 +
 .../contrib/files/browser/explorerViewlet.ts  |  2 +-
 .../markers/browser/markers.contribution.ts   |  2 +-
 .../contrib/markers/browser/messages.ts       |  1 +
 .../output/browser/output.contribution.ts     |  2 +-
 .../contrib/remote/browser/remoteExplorer.ts  |  2 +-
 .../contrib/scm/browser/scm.contribution.ts   |  2 +-
 .../terminal/browser/terminal.contribution.ts |  2 +-
 .../testing/browser/testing.contribution.ts   |  4 +-
 .../userDataSync/browser/userDataSync.ts      |  4 +-
 .../userDataSync/common/userDataSync.ts       |  1 +
 .../views/browser/viewDescriptorService.ts    |  2 +-
 .../test/browser/viewContainerModel.test.ts   | 44 +++++++++----------
 .../browser/viewDescriptorService.test.ts     | 16 +++----
 24 files changed, 57 insertions(+), 52 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadComments.ts b/src/vs/workbench/api/browser/mainThreadComments.ts
index 29f7b613e5a..ab886d7dc8c 100644
--- a/src/vs/workbench/api/browser/mainThreadComments.ts
+++ b/src/vs/workbench/api/browser/mainThreadComments.ts
@@ -16,7 +16,7 @@ import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/ext
 import { ICommentController, ICommentInfo, ICommentService, INotebookCommentInfo } from 'vs/workbench/contrib/comments/browser/commentService';
 import { CommentsPanel } from 'vs/workbench/contrib/comments/browser/commentsView';
 import { CommentProviderFeatures, ExtHostCommentsShape, ExtHostContext, MainContext, MainThreadCommentsShape, CommentThreadChanges } from '../common/extHost.protocol';
-import { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
+import { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_ORIGINAL_TITLE } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
 import { ViewContainer, IViewContainersRegistry, Extensions as ViewExtensions, ViewContainerLocation, IViewsRegistry, IViewsService, IViewDescriptorService } from 'vs/workbench/common/views';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
@@ -596,7 +596,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 		if (!commentsViewAlreadyRegistered) {
 			const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
 				id: COMMENTS_VIEW_ID,
-				title: COMMENTS_VIEW_TITLE,
+				title: { value: COMMENTS_VIEW_TITLE, original: COMMENTS_VIEW_ORIGINAL_TITLE },
 				ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [COMMENTS_VIEW_ID, { mergeViewWithContainerWhenSingleView: true }]),
 				storageId: COMMENTS_VIEW_STORAGE_ID,
 				hideIfEmpty: true,
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
index f97885e8e02..23d64b26b76 100644
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -435,7 +435,8 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 
 			viewContainer = this.viewContainersRegistry.registerViewContainer({
 				id,
-				title, extensionId,
+				title: { value: title, original: title },
+				extensionId,
 				ctorDescriptor: new SyncDescriptor(
 					ViewPaneContainer,
 					[id, { mergeViewWithContainerWhenSingleView: true }]
diff --git a/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts b/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts
index 421d9eecd4a..f796cae8ed2 100644
--- a/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts
@@ -52,7 +52,7 @@ suite('MainThreadHostTreeView', function () {
 		const instantiationService: TestInstantiationService = <TestInstantiationService>workbenchInstantiationService(undefined, disposables);
 		const viewDescriptorService = instantiationService.createInstance(ViewDescriptorService);
 		instantiationService.stub(IViewDescriptorService, viewDescriptorService);
-		container = Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).registerViewContainer({ id: 'testContainer', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).registerViewContainer({ id: 'testContainer', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const viewDescriptor: ITreeViewDescriptor = {
 			id: testTreeViewId,
 			ctorDescriptor: null!,
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index 07578cb75b6..8633aac784a 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -75,7 +75,7 @@ export interface IViewContainerDescriptor {
 	/**
 	 * The title of the view container
 	 */
-	readonly title: ILocalizedString | string;
+	readonly title: ILocalizedString;
 
 	/**
 	 * Icon representation of the View container
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts
index 2c3c2a6d72e..ff63502983b 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts
@@ -326,7 +326,7 @@ const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codic
 
 const container = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
 	id: BulkEditPane.ID,
-	title: localize('panel', "Refactor Preview"),
+	title: { value: localize('panel', "Refactor Preview"), original: 'Refactor Preview' },
 	hideIfEmpty: true,
 	ctorDescriptor: new SyncDescriptor(
 		ViewPaneContainer,
diff --git a/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.ts b/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.ts
index d10beb91120..aa774249863 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.ts
@@ -113,7 +113,7 @@ export class ChatContributionService implements IChatContributionService {
 		const viewContainerId = CHAT_SIDEBAR_PANEL_ID + '.' + providerDescriptor.id;
 		const viewContainer: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
 			id: viewContainerId,
-			title,
+			title: { value: title, original: 'Chat' },
 			icon,
 			ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [viewContainerId, { mergeViewWithContainerWhenSingleView: true }]),
 			storageId: viewContainerId,
diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
index c0e24d570e5..890437bb65a 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -33,6 +33,7 @@ import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
 
 export const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 export const COMMENTS_VIEW_STORAGE_ID = 'Comments';
+export const COMMENTS_VIEW_ORIGINAL_TITLE = 'Comments';
 export const COMMENTS_VIEW_TITLE = nls.localize('comments.view.title', "Comments");
 
 interface IResourceTemplateData {
diff --git a/src/vs/workbench/contrib/comments/test/browser/commentsView.test.ts b/src/vs/workbench/contrib/comments/test/browser/commentsView.test.ts
index 7dbdff3d855..83d2bf1ccea 100644
--- a/src/vs/workbench/contrib/comments/test/browser/commentsView.test.ts
+++ b/src/vs/workbench/contrib/comments/test/browser/commentsView.test.ts
@@ -54,7 +54,7 @@ export class TestViewDescriptorService implements Partial<IViewDescriptorService
 	getViewContainerByViewId(id: string): ViewContainer | null {
 		return {
 			id: 'comments',
-			title: 'Comments',
+			title: { value: 'Comments', original: 'Comments' },
 			ctorDescriptor: {} as any
 		};
 	}
diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index c0d1213a3c3..3b9e5b4e323 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -365,7 +365,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
 
 const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
 	id: DEBUG_PANEL_ID,
-	title: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' }, "Debug Console"),
+	title: { value: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' }, "Debug Console"), original: 'Debug Console' },
 	icon: icons.debugConsoleViewIcon,
 	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [DEBUG_PANEL_ID, { mergeViewWithContainerWhenSingleView: true }]),
 	storageId: DEBUG_PANEL_ID,
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
index 2ac22f1d0d7..9495543aad6 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
@@ -10,7 +10,7 @@ import { ILifecycleService, LifecyclePhase, ShutdownReason } from 'vs/workbench/
 import { Action2, IAction2Options, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { localize } from 'vs/nls';
-import { IEditSessionsStorageService, Change, ChangeType, Folder, EditSession, FileType, EDIT_SESSION_SYNC_CATEGORY, EDIT_SESSIONS_CONTAINER_ID, EditSessionSchemaVersion, IEditSessionsLogService, EDIT_SESSIONS_VIEW_ICON, EDIT_SESSIONS_TITLE, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_DATA_VIEW_ID, decodeEditSessionFileContent, hashedEditSessionId, editSessionsLogId, EDIT_SESSIONS_PENDING } from 'vs/workbench/contrib/editSessions/common/editSessions';
+import { IEditSessionsStorageService, Change, ChangeType, Folder, EditSession, FileType, EDIT_SESSION_SYNC_CATEGORY, EDIT_SESSIONS_CONTAINER_ID, EditSessionSchemaVersion, IEditSessionsLogService, EDIT_SESSIONS_VIEW_ICON, EDIT_SESSIONS_TITLE, EDIT_SESSIONS_ORIGINAL_TITLE, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_DATA_VIEW_ID, decodeEditSessionFileContent, hashedEditSessionId, editSessionsLogId, EDIT_SESSIONS_PENDING } from 'vs/workbench/contrib/editSessions/common/editSessions';
 import { ISCMRepository, ISCMService } from 'vs/workbench/contrib/scm/common/scm';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
@@ -274,7 +274,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		const container = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer(
 			{
 				id: EDIT_SESSIONS_CONTAINER_ID,
-				title: EDIT_SESSIONS_TITLE,
+				title: { value: EDIT_SESSIONS_TITLE, original: EDIT_SESSIONS_ORIGINAL_TITLE },
 				ctorDescriptor: new SyncDescriptor(
 					ViewPaneContainer,
 					[EDIT_SESSIONS_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]
diff --git a/src/vs/workbench/contrib/editSessions/common/editSessions.ts b/src/vs/workbench/contrib/editSessions/common/editSessions.ts
index 53c39076411..4cb53dc45f7 100644
--- a/src/vs/workbench/contrib/editSessions/common/editSessions.ts
+++ b/src/vs/workbench/contrib/editSessions/common/editSessions.ts
@@ -98,6 +98,7 @@ export const EDIT_SESSIONS_PENDING = new RawContextKey<boolean>(EDIT_SESSIONS_PE
 
 export const EDIT_SESSIONS_CONTAINER_ID = 'workbench.view.editSessions';
 export const EDIT_SESSIONS_DATA_VIEW_ID = 'workbench.views.editSessions.data';
+export const EDIT_SESSIONS_ORIGINAL_TITLE = 'Cloud Changes';
 export const EDIT_SESSIONS_TITLE = localize('cloud changes', 'Cloud Changes');
 
 export const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, localize('editSessionViewIcon', 'View icon of the cloud changes view.'));
diff --git a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
index 602ffa99968..af0be566a8b 100644
--- a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
@@ -252,7 +252,7 @@ const viewContainerRegistry = Registry.as<IViewContainersRegistry>(Extensions.Vi
  */
 export const VIEW_CONTAINER: ViewContainer = viewContainerRegistry.registerViewContainer({
 	id: VIEWLET_ID,
-	title: localize('explore', "Explorer"),
+	title: { value: localize('explore', "Explorer"), original: 'Explorer' },
 	ctorDescriptor: new SyncDescriptor(ExplorerViewPaneContainer),
 	storageId: 'workbench.explorer.views.state',
 	icon: explorerViewIcon,
diff --git a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
index 275a84b8c9a..ef2f37cee8c 100644
--- a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
+++ b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
@@ -128,7 +128,7 @@ const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, local
 // markers view container
 const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
 	id: Markers.MARKERS_CONTAINER_ID,
-	title: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
+	title: { value: Messages.MARKERS_PANEL_TITLE_PROBLEMS, original: Messages.MARKERS_PANEL_ORIGINAL_TITLE_PROBLEMS },
 	icon: markersViewIcon,
 	hideIfEmpty: true,
 	order: 0,
diff --git a/src/vs/workbench/contrib/markers/browser/messages.ts b/src/vs/workbench/contrib/markers/browser/messages.ts
index 7ff0582f02f..767485b3692 100644
--- a/src/vs/workbench/contrib/markers/browser/messages.ts
+++ b/src/vs/workbench/contrib/markers/browser/messages.ts
@@ -21,6 +21,7 @@ export default class Messages {
 	public static PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY: string = nls.localize('problems.panel.configuration.compareOrder.severity', "Navigate problems ordered by severity");
 	public static PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION: string = nls.localize('problems.panel.configuration.compareOrder.position', "Navigate problems ordered by position");
 
+	public static MARKERS_PANEL_ORIGINAL_TITLE_PROBLEMS: string = 'Problems';
 	public static MARKERS_PANEL_TITLE_PROBLEMS: string = nls.localize('markers.panel.title.problems', "Problems");
 
 	public static MARKERS_PANEL_NO_PROBLEMS_BUILT: string = nls.localize('markers.panel.no.problems.build', "No problems have been detected in the workspace.");
diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts
index 87d04e5fb83..44b292ed5b1 100644
--- a/src/vs/workbench/contrib/output/browser/output.contribution.ts
+++ b/src/vs/workbench/contrib/output/browser/output.contribution.ts
@@ -54,7 +54,7 @@ ModesRegistry.registerLanguage({
 const outputViewIcon = registerIcon('output-view-icon', Codicon.output, nls.localize('outputViewIcon', 'View icon of the output view.'));
 const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
 	id: OUTPUT_VIEW_ID,
-	title: nls.localize('output', "Output"),
+	title: { value: nls.localize('output', "Output"), original: 'Output' },
 	icon: outputViewIcon,
 	order: 1,
 	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [OUTPUT_VIEW_ID, { mergeViewWithContainerWhenSingleView: true }]),
diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
index fef42ab467a..f3785c75aed 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
@@ -61,7 +61,7 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 	private async getViewContainer(): Promise<ViewContainer | null> {
 		return Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).registerViewContainer({
 			id: TUNNEL_VIEW_CONTAINER_ID,
-			title: nls.localize('ports', "Ports"),
+			title: { value: nls.localize('ports', "Ports"), original: 'Ports' },
 			icon: portsViewIcon,
 			ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [TUNNEL_VIEW_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]),
 			storageId: TUNNEL_VIEW_CONTAINER_ID,
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index e034cf09200..f78bcd673ab 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -47,7 +47,7 @@ const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.s
 
 const viewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
 	id: VIEWLET_ID,
-	title: localize('source control', "Source Control"),
+	title: { value: localize('source control', "Source Control"), original: 'Source Control' },
 	ctorDescriptor: new SyncDescriptor(SCMViewPaneContainer),
 	storageId: 'workbench.scm.views.state',
 	icon: sourceControlViewIcon,
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
index eea627b0e88..1bb341555ef 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -123,7 +123,7 @@ Registry.as<IDragAndDropContributionRegistry>(DragAndDropExtensions.DragAndDropC
 // Register views
 const VIEW_CONTAINER = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
 	id: TERMINAL_VIEW_ID,
-	title: nls.localize('terminal', "Terminal"),
+	title: { value: nls.localize('terminal', "Terminal"), original: 'Terminal' },
 	icon: terminalViewIcon,
 	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [TERMINAL_VIEW_ID, { mergeViewWithContainerWhenSingleView: true }]),
 	storageId: TERMINAL_VIEW_ID,
diff --git a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
index cac9c0c5022..f628cbf59ec 100644
--- a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
+++ b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
@@ -56,7 +56,7 @@ registerSingleton(ITestingDecorationsService, TestingDecorationService, Instanti
 
 const viewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
 	id: Testing.ViewletId,
-	title: localize('test', "Testing"),
+	title: { value: localize('test', "Testing"), original: 'Testing' },
 	ctorDescriptor: new SyncDescriptor(TestingViewPaneContainer),
 	icon: testingViewIcon,
 	alwaysUseContainerInfo: true,
@@ -74,7 +74,7 @@ const viewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensio
 
 const testResultsViewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
 	id: Testing.ResultsPanelId,
-	title: localize('testResultsPanelName', "Test Results"),
+	title: { value: localize('testResultsPanelName', "Test Results"), original: 'Test Results' },
 	icon: testingResultsIcon,
 	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [Testing.ResultsPanelId, { mergeViewWithContainerWhenSingleView: true }]),
 	hideIfEmpty: true,
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index 870402650e2..e50bd3e8559 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -43,7 +43,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ViewContainerLocation, IViewContainersRegistry, Extensions, ViewContainer } from 'vs/workbench/common/views';
 import { UserDataSyncDataViews } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncViews';
-import { IUserDataSyncWorkbenchService, getSyncAreaLabel, AccountStatus, CONTEXT_SYNC_STATE, CONTEXT_SYNC_ENABLEMENT, CONTEXT_ACCOUNT_STATE, CONFIGURE_SYNC_COMMAND_ID, SHOW_SYNC_LOG_COMMAND_ID, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_VIEW_ICON, CONTEXT_HAS_CONFLICTS } from 'vs/workbench/services/userDataSync/common/userDataSync';
+import { IUserDataSyncWorkbenchService, getSyncAreaLabel, AccountStatus, CONTEXT_SYNC_STATE, CONTEXT_SYNC_ENABLEMENT, CONTEXT_ACCOUNT_STATE, CONFIGURE_SYNC_COMMAND_ID, SHOW_SYNC_LOG_COMMAND_ID, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_ORIGINAL_TITLE, SYNC_VIEW_ICON, CONTEXT_HAS_CONFLICTS } from 'vs/workbench/services/userDataSync/common/userDataSync';
 import { Codicon } from 'vs/base/common/codicons';
 import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
@@ -1134,7 +1134,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		return Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).registerViewContainer(
 			{
 				id: SYNC_VIEW_CONTAINER_ID,
-				title: SYNC_TITLE,
+				title: { value: SYNC_TITLE, original: SYNC_ORIGINAL_TITLE },
 				ctorDescriptor: new SyncDescriptor(
 					ViewPaneContainer,
 					[SYNC_VIEW_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]
diff --git a/src/vs/workbench/services/userDataSync/common/userDataSync.ts b/src/vs/workbench/services/userDataSync/common/userDataSync.ts
index 9a709322d34..1cfcc42cc02 100644
--- a/src/vs/workbench/services/userDataSync/common/userDataSync.ts
+++ b/src/vs/workbench/services/userDataSync/common/userDataSync.ts
@@ -69,6 +69,7 @@ export interface IUserDataSyncConflictsView extends IView {
 	open(conflict: IResourcePreview): Promise<void>;
 }
 
+export const SYNC_ORIGINAL_TITLE = 'Settings Sync';
 export const SYNC_TITLE = localize('sync category', "Settings Sync");
 
 export const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, localize('syncViewIcon', 'View icon of the Settings Sync view.'));
diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
index b802ba5eab5..248e5db87be 100644
--- a/src/vs/workbench/services/views/browser/viewDescriptorService.ts
+++ b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
@@ -490,7 +490,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 		const container = this.viewContainersRegistry.registerViewContainer({
 			id,
 			ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [id, { mergeViewWithContainerWhenSingleView: true }]),
-			title: id, // we don't want to see this so using id
+			title: { value: id, original: id }, // we don't want to see this so using id
 			icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
 			storageId: getViewContainerStorageId(id),
 			hideIfEmpty: true
diff --git a/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts b/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts
index e445f4a41b9..57723675e03 100644
--- a/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts
+++ b/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts
@@ -64,13 +64,13 @@ suite('ViewContainerModel', () => {
 	});
 
 	test('empty model', function () {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		assert.strictEqual(testObject.visibleViewDescriptors.length, 0);
 	});
 
 	test('register/unregister', () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 
@@ -97,7 +97,7 @@ suite('ViewContainerModel', () => {
 	});
 
 	test('when contexts', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		assert.strictEqual(testObject.visibleViewDescriptors.length, 0);
@@ -141,7 +141,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('when contexts - multiple', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const view1: IViewDescriptor = { id: 'view1', ctorDescriptor: null!, name: 'Test View 1' };
@@ -164,7 +164,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('when contexts - multiple 2', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const view1: IViewDescriptor = { id: 'view1', ctorDescriptor: null!, name: 'Test View 1', when: ContextKeyExpr.equals('showview1', true) };
@@ -187,7 +187,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('setVisible', () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const view1: IViewDescriptor = { id: 'view1', ctorDescriptor: null!, name: 'Test View 1', canToggleVisibility: true };
@@ -232,7 +232,7 @@ suite('ViewContainerModel', () => {
 	});
 
 	test('move', () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const view1: IViewDescriptor = { id: 'view1', ctorDescriptor: null!, name: 'Test View 1' };
@@ -262,7 +262,7 @@ suite('ViewContainerModel', () => {
 
 	test('view states', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		storageService.store(`${container.id}.state.hidden`, JSON.stringify([{ id: 'view1', isHidden: true }]), StorageScope.PROFILE, StorageTarget.MACHINE);
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 
@@ -282,7 +282,7 @@ suite('ViewContainerModel', () => {
 
 	test('view states and when contexts', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		storageService.store(`${container.id}.state.hidden`, JSON.stringify([{ id: 'view1', isHidden: true }]), StorageScope.PROFILE, StorageTarget.MACHINE);
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 
@@ -312,7 +312,7 @@ suite('ViewContainerModel', () => {
 
 	test('view states and when contexts multiple views', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		storageService.store(`${container.id}.state.hidden`, JSON.stringify([{ id: 'view1', isHidden: true }]), StorageScope.PROFILE, StorageTarget.MACHINE);
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 
@@ -357,7 +357,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('remove event is not triggered if view was hidden and removed', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const viewDescriptor: IViewDescriptor = {
@@ -387,7 +387,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('add event is not triggered if view was set visible (when visible) and not active', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const viewDescriptor: IViewDescriptor = {
@@ -414,7 +414,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('remove event is not triggered if view was hidden and not active', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const viewDescriptor: IViewDescriptor = {
@@ -441,7 +441,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('add event is not triggered if view was set visible (when not visible) and not active', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const viewDescriptor: IViewDescriptor = {
@@ -472,7 +472,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('added view descriptors are in ascending order in the event', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 
@@ -523,7 +523,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('add event is triggered only once when view is set visible while it is set active', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const viewDescriptor: IViewDescriptor = {
@@ -554,7 +554,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('add event is not triggered only when view is set hidden while it is set active', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const viewDescriptor: IViewDescriptor = {
@@ -583,7 +583,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('#142087: view descriptor visibility is not reset', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const viewDescriptor: IViewDescriptor = {
 			id: 'view1',
@@ -606,7 +606,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('remove event is triggered properly if mutliple views are hidden at the same time', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const viewDescriptor1: IViewDescriptor = {
@@ -664,7 +664,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('add event is triggered properly if mutliple views are hidden at the same time', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const viewDescriptor1: IViewDescriptor = {
@@ -732,7 +732,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('add and remove events are triggered properly if mutliple views are hidden and added at the same time', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const testObject = viewDescriptorService.getViewContainerModel(container);
 		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
 		const viewDescriptor1: IViewDescriptor = {
@@ -809,7 +809,7 @@ suite('ViewContainerModel', () => {
 	}));
 
 	test('newly added view descriptor is hidden if it was toggled hidden in storage before adding', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
-		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const viewDescriptor: IViewDescriptor = {
 			id: 'view1',
 			ctorDescriptor: null!,
diff --git a/src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts b/src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts
index 74b4b56185d..4a1c167c07f 100644
--- a/src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts
+++ b/src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts
@@ -21,8 +21,8 @@ import { compare } from 'vs/base/common/strings';
 const ViewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
 const ViewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
 const viewContainerIdPrefix = 'testViewContainer';
-const sidebarContainer = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
-const panelContainer = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Panel);
+const sidebarContainer = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+const panelContainer = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Panel);
 
 suite('ViewDescriptorService', () => {
 
@@ -331,7 +331,7 @@ suite('ViewDescriptorService', () => {
 
 	test('initialize with custom locations', async function () {
 		const storageService = instantiationService.get(IStorageService);
-		const viewContainer1 = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		const viewContainer1 = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const generateViewContainer1 = `workbench.views.service.${ViewContainerLocationToString(ViewContainerLocation.Sidebar)}.${generateUuid()}`;
 		const viewsCustomizations = {
 			viewContainerLocations: {
@@ -390,7 +390,7 @@ suite('ViewDescriptorService', () => {
 	test('storage change', async function () {
 		const testObject = aViewDescriptorService();
 
-		const viewContainer1 = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		const viewContainer1 = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const generateViewContainer1 = `workbench.views.service.${ViewContainerLocationToString(ViewContainerLocation.Sidebar)}.${generateUuid()}`;
 
 		const viewDescriptors: IViewDescriptor[] = [
@@ -525,7 +525,7 @@ suite('ViewDescriptorService', () => {
 
 	test('custom locations take precedence when default view container of views change', async function () {
 		const storageService = instantiationService.get(IStorageService);
-		const viewContainer1 = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		const viewContainer1 = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const generateViewContainer1 = `workbench.views.service.${ViewContainerLocationToString(ViewContainerLocation.Sidebar)}.${generateUuid()}`;
 		const viewsCustomizations = {
 			viewContainerLocations: {
@@ -587,7 +587,7 @@ suite('ViewDescriptorService', () => {
 
 	test('view containers with not existing views are not removed from customizations', async function () {
 		const storageService = instantiationService.get(IStorageService);
-		const viewContainer1 = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		const viewContainer1 = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const generateViewContainer1 = `workbench.views.service.${ViewContainerLocationToString(ViewContainerLocation.Sidebar)}.${generateUuid()}`;
 		const viewsCustomizations = {
 			viewContainerLocations: {
@@ -637,7 +637,7 @@ suite('ViewDescriptorService', () => {
 		};
 		storageService.store('views.customizations', JSON.stringify(viewsCustomizations), StorageScope.PROFILE, StorageTarget.USER);
 
-		const viewContainer = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		const viewContainer = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const viewDescriptors: IViewDescriptor[] = [
 			{
 				id: 'view1',
@@ -669,7 +669,7 @@ suite('ViewDescriptorService', () => {
 		const storageService = instantiationService.get(IStorageService);
 		const testObject = aViewDescriptorService();
 
-		const viewContainer = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		const viewContainer = ViewContainersRegistry.registerViewContainer({ id: `${viewContainerIdPrefix}-${generateUuid()}`, title: { value: 'test', original: 'test' }, ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
 		const viewDescriptors: IViewDescriptor[] = [
 			{
 				id: 'view1',

From 5d10e5ac5efafbeb5425b2b979d5ff584e13cba9 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 1 Sep 2023 15:14:50 -0700
Subject: [PATCH 49/94] rm debug code

---
 .../contrib/inlineChat/test/browser/inlineChatController.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
index 0290893971c..e31040fecc5 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -149,7 +149,6 @@ suite('InteractiveChatController', function () {
 	// ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('creation, not showing anything', function () {
-		for (let deadline = Date.now() + 1000; Date.now() < deadline;) { }
 		ctrl = instaService.createInstance(TestController, editor);
 		assert.ok(ctrl);
 		assert.strictEqual(ctrl.getWidgetPosition(), undefined);

From 6db3388f33041cf539d51a679dacdb4fb282b333 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Mon, 4 Sep 2023 09:36:10 +0200
Subject: [PATCH 50/94] mark tests as skipped, remove fix attempt

---
 src/vs/editor/contrib/suggest/browser/suggestModel.ts       | 6 ------
 .../contrib/suggest/test/browser/suggestController.test.ts  | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/vs/editor/contrib/suggest/browser/suggestModel.ts b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
index c4e44699449..fd8d533f594 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
@@ -635,12 +635,6 @@ export class SuggestModel implements IDisposable {
 			return;
 		}
 
-		if (!ctx.leadingLineContent.startsWith(this._context.leadingLineContent) && !this._context.leadingLineContent.startsWith(ctx.leadingLineContent)) {
-			// e.g. happens when line prefix changes, e.g delete while suggest is showing
-			this.cancel();
-			return;
-		}
-
 		if (getLeadingWhitespace(ctx.leadingLineContent) !== getLeadingWhitespace(this._context.leadingLineContent)) {
 			// cancel IntelliSense when line start changes
 			// happens when the current word gets outdented
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
index bbb32d3fe37..4e8202abc64 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
@@ -581,7 +581,7 @@ suite('SuggestController', function () {
 		assert.strictEqual(editor.getValue(), 'for');
 	});
 
-	test('Suggest widget gets orphaned in editor #187779', async function () {
+	test.skip('Suggest widget gets orphaned in editor #187779', async function () {
 
 		disposables.add(languageFeaturesService.completionProvider.register({ scheme: 'test-ctrl' }, {
 			_debugDisplayName: 'test',

From 83120dbf0646e61a219febe51e63ddd88e149cbd Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Mon, 4 Sep 2023 09:44:42 +0200
Subject: [PATCH 51/94] chore - tackle todo for type converter

---
 .../workbench/api/common/extHostInlineChat.ts | 19 +------------------
 .../api/common/extHostTypeConverters.ts       | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostInlineChat.ts b/src/vs/workbench/api/common/extHostInlineChat.ts
index 32161feb629..d46e67243fc 100644
--- a/src/vs/workbench/api/common/extHostInlineChat.ts
+++ b/src/vs/workbench/api/common/extHostInlineChat.ts
@@ -223,25 +223,8 @@ export class ExtHostInteractiveEditor implements ExtHostInlineChatShape {
 		const entry = this._inputProvider.get(handle);
 		const sessionData = this._inputSessions.get(sessionId);
 		const response = sessionData?.responses[responseId];
-
 		if (entry && response) {
-			// todo@jrieken move to type converter
-			let apiKind: extHostTypes.InteractiveEditorResponseFeedbackKind;
-			switch (kind) {
-				case InlineChatResponseFeedbackKind.Helpful:
-					apiKind = extHostTypes.InteractiveEditorResponseFeedbackKind.Helpful;
-					break;
-				case InlineChatResponseFeedbackKind.Unhelpful:
-					apiKind = extHostTypes.InteractiveEditorResponseFeedbackKind.Unhelpful;
-					break;
-				case InlineChatResponseFeedbackKind.Undone:
-					apiKind = extHostTypes.InteractiveEditorResponseFeedbackKind.Undone;
-					break;
-				case InlineChatResponseFeedbackKind.Accepted:
-					apiKind = extHostTypes.InteractiveEditorResponseFeedbackKind.Accepted;
-					break;
-			}
-
+			const apiKind = typeConvert.InteractiveEditorResponseFeedbackKind.to(kind);
 			entry.provider.handleInteractiveEditorResponseFeedback?.(sessionData.session, response, apiKind);
 		}
 	}
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index d5939c95e25..06f595fcb7b 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -46,6 +46,7 @@ import type * as vscode from 'vscode';
 import * as types from './extHostTypes';
 import * as chatProvider from 'vs/workbench/contrib/chat/common/chatProvider';
 import { IChatRequestVariableValue } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { InlineChatResponseFeedbackKind } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 
 export namespace Command {
 
@@ -2267,6 +2268,22 @@ export namespace ChatVariableLevel {
 	}
 }
 
+export namespace InteractiveEditorResponseFeedbackKind {
+
+	export function to(kind: InlineChatResponseFeedbackKind): vscode.InteractiveEditorResponseFeedbackKind {
+		switch (kind) {
+			case InlineChatResponseFeedbackKind.Helpful:
+				return types.InteractiveEditorResponseFeedbackKind.Helpful;
+			case InlineChatResponseFeedbackKind.Unhelpful:
+				return types.InteractiveEditorResponseFeedbackKind.Unhelpful;
+			case InlineChatResponseFeedbackKind.Undone:
+				return types.InteractiveEditorResponseFeedbackKind.Undone;
+			case InlineChatResponseFeedbackKind.Accepted:
+				return types.InteractiveEditorResponseFeedbackKind.Accepted;
+		}
+	}
+}
+
 
 export namespace TerminalQuickFix {
 	export function from(quickFix: vscode.TerminalQuickFixExecuteTerminalCommand | vscode.TerminalQuickFixOpener | vscode.Command, converter: Command.ICommandsConverter, disposables: DisposableStore): extHostProtocol.ITerminalQuickFixExecuteTerminalCommandDto | extHostProtocol.ITerminalQuickFixOpenerDto | extHostProtocol.ICommandDto | undefined {

From 5fc89eb71380e7850e07a8a2cf8827421daab404 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 4 Sep 2023 09:45:00 +0200
Subject: [PATCH 52/94] Small diff editor refactoring

---
 .../diffEditorWidget2/diffEditorEditors.ts    |  7 ++-
 .../diffEditorWidget2/diffEditorOptions.ts    |  2 +-
 .../diffEditorWidget2/diffEditorViewModel.ts  | 21 ++++---
 .../diffEditorWidget2/diffEditorWidget2.ts    |  6 +-
 ...nges.ts => hideUnchangedRegionsFeature.ts} | 61 +++++++++++--------
 .../browser/widget/diffEditorWidget2/utils.ts |  7 +++
 .../browser/widget/diffEditorWidget2.test.ts  |  2 +-
 7 files changed, 63 insertions(+), 43 deletions(-)
 rename src/vs/editor/browser/widget/diffEditorWidget2/{unchangedRanges.ts => hideUnchangedRegionsFeature.ts} (91%)

diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
index 254ce84d2be..2294861e7af 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import { Emitter } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IReader, autorunHandleChanges } from 'vs/base/common/observable';
+import { IObservable, IReader, autorunHandleChanges, observableFromEvent } from 'vs/base/common/observable';
 import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
 import { IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
 import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
@@ -16,6 +16,7 @@ import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DiffEditorOptions } from './diffEditorOptions';
+import { ITextModel } from 'vs/editor/common/model';
 
 export class DiffEditorEditors extends Disposable {
 	public readonly modified: CodeEditorWidget;
@@ -24,6 +25,8 @@ export class DiffEditorEditors extends Disposable {
 	private readonly _onDidContentSizeChange = this._register(new Emitter<IContentSizeChangedEvent>());
 	public get onDidContentSizeChange() { return this._onDidContentSizeChange.event; }
 
+	public readonly modifiedModel: IObservable<ITextModel | null>;
+
 	constructor(
 		private readonly originalEditorElement: HTMLElement,
 		private readonly modifiedEditorElement: HTMLElement,
@@ -38,6 +41,8 @@ export class DiffEditorEditors extends Disposable {
 		this.original = this._register(this._createLeftHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.originalEditor || {}));
 		this.modified = this._register(this._createRightHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.modifiedEditor || {}));
 
+		this.modifiedModel = observableFromEvent(this.modified.onDidChangeModel, () => this.modified.getModel());
+
 		this._register(autorunHandleChanges({
 			createEmptyChangeSummary: () => ({} as IDiffEditorConstructionOptions),
 			handleChange: (ctx, changeSummary) => {
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions.ts
index ffb76330146..066eefdb1e5 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions.ts
@@ -54,7 +54,7 @@ export class DiffEditorOptions {
 	public readonly hideUnchangedRegions = derived(reader => /** @description hideUnchangedRegions */ this._options.read(reader).hideUnchangedRegions.enabled!);
 	public readonly hideUnchangedRegionsRevealLineCount = derived(reader => /** @description hideUnchangedRegions */ this._options.read(reader).hideUnchangedRegions.revealLineCount!);
 	public readonly hideUnchangedRegionsContextLineCount = derived(reader => /** @description hideUnchangedRegions */ this._options.read(reader).hideUnchangedRegions.contextLineCount!);
-	public readonly hideUnchangedRegionsminimumLineCount = derived(reader => /** @description hideUnchangedRegions */ this._options.read(reader).hideUnchangedRegions.minimumLineCount!);
+	public readonly hideUnchangedRegionsMinimumLineCount = derived(reader => /** @description hideUnchangedRegions */ this._options.read(reader).hideUnchangedRegions.minimumLineCount!);
 
 	public updateOptions(changedOptions: IDiffEditorOptions): void {
 		const newDiffEditorOptions = validateDiffEditorOptions(changedOptions, this._options.get());
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
index 143b1834b66..dd4714d7173 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
@@ -82,7 +82,7 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 				result.changes,
 				model.original.getLineCount(),
 				model.modified.getLineCount(),
-				this._options.hideUnchangedRegionsminimumLineCount.read(reader),
+				this._options.hideUnchangedRegionsMinimumLineCount.read(reader),
 				this._options.hideUnchangedRegionsContextLineCount.read(reader),
 			);
 
@@ -99,18 +99,18 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 
 			const originalDecorationIds = model.original.deltaDecorations(
 				lastUnchangedRegions.originalDecorationIds,
-				newUnchangedRegions.map(r => ({ range: r.originalRange.toInclusiveRange()!, options: { description: 'unchanged' } }))
+				newUnchangedRegions.map(r => ({ range: r.originalUnchangedRange.toInclusiveRange()!, options: { description: 'unchanged' } }))
 			);
 			const modifiedDecorationIds = model.modified.deltaDecorations(
 				lastUnchangedRegions.modifiedDecorationIds,
-				newUnchangedRegions.map(r => ({ range: r.modifiedRange.toInclusiveRange()!, options: { description: 'unchanged' } }))
+				newUnchangedRegions.map(r => ({ range: r.modifiedUnchangedRange.toInclusiveRange()!, options: { description: 'unchanged' } }))
 			);
 
 
 			for (const r of newUnchangedRegions) {
 				for (let i = 0; i < lastUnchangedRegions.regions.length; i++) {
-					if (r.originalRange.intersectsStrict(lastUnchangedRegionsOrigRanges[i])
-						&& r.modifiedRange.intersectsStrict(lastUnchangedRegionsModRanges[i])) {
+					if (r.originalUnchangedRange.intersectsStrict(lastUnchangedRegionsOrigRanges[i])
+						&& r.modifiedUnchangedRange.intersectsStrict(lastUnchangedRegionsModRanges[i])) {
 						r.setHiddenModifiedRange(lastUnchangedRegions.regions[i].getHiddenModifiedRange(undefined), tx);
 						break;
 					}
@@ -169,7 +169,7 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 			/** @description compute diff */
 
 			// So that they get recomputed when these settings change
-			this._options.hideUnchangedRegionsminimumLineCount.read(reader);
+			this._options.hideUnchangedRegionsMinimumLineCount.read(reader);
 			this._options.hideUnchangedRegionsContextLineCount.read(reader);
 
 			debouncer.cancel();
@@ -260,7 +260,7 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 		transaction(tx => {
 			for (const r of regions.regions) {
 				for (const range of ranges) {
-					if (r.modifiedRange.intersect(range)) {
+					if (r.modifiedUnchangedRange.intersect(range)) {
 						r.setHiddenModifiedRange(range, tx);
 						break;
 					}
@@ -357,11 +357,11 @@ export class UnchangedRegion {
 		return result;
 	}
 
-	public get originalRange(): LineRange {
+	public get originalUnchangedRange(): LineRange {
 		return LineRange.ofLength(this.originalLineNumber, this.lineCount);
 	}
 
-	public get modifiedRange(): LineRange {
+	public get modifiedUnchangedRange(): LineRange {
 		return LineRange.ofLength(this.modifiedLineNumber, this.lineCount);
 	}
 
@@ -371,7 +371,8 @@ export class UnchangedRegion {
 	private readonly _visibleLineCountBottom = observableValue<number>('visibleLineCountBottom', 0);
 	public readonly visibleLineCountBottom: ISettableObservable<number> = this._visibleLineCountBottom;
 
-	private readonly _shouldHideControls = derived(reader => /** @description isVisible */ this.visibleLineCountTop.read(reader) + this.visibleLineCountBottom.read(reader) === this.lineCount && !this.isDragged.read(reader));
+	private readonly _shouldHideControls = derived(reader => /** @description isVisible */
+		this.visibleLineCountTop.read(reader) + this.visibleLineCountBottom.read(reader) === this.lineCount && !this.isDragged.read(reader));
 
 	public readonly isDragged = observableValue<boolean>('isDragged', false);
 
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
index 94af3098934..40094652891 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
@@ -21,7 +21,7 @@ import { DiffEditorSash } from 'vs/editor/browser/widget/diffEditorWidget2/diffE
 import { ViewZoneManager } from 'vs/editor/browser/widget/diffEditorWidget2/lineAlignment';
 import { MovedBlocksLinesPart } from 'vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines';
 import { OverviewRulerPart } from 'vs/editor/browser/widget/diffEditorWidget2/overviewRulerPart';
-import { UnchangedRangesFeature } from 'vs/editor/browser/widget/diffEditorWidget2/unchangedRanges';
+import { HideUnchangedRegionsFeature } from 'vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature';
 import { CSSStyle, ObservableElementSizeObserver, applyStyle, readHotReloadableExport } from 'vs/editor/browser/widget/diffEditorWidget2/utils';
 import { WorkerBasedDocumentDiffProvider } from 'vs/editor/browser/widget/workerBasedDocumentDiffProvider';
 import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
@@ -68,7 +68,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 	private readonly _sash: IObservable<DiffEditorSash | undefined>;
 	private readonly _boundarySashes = observableValue<IBoundarySashes | undefined>('boundarySashes', undefined);
 
-	private unchangedRangesFeature!: UnchangedRangesFeature;
+	private unchangedRangesFeature!: HideUnchangedRegionsFeature;
 
 	private _accessibleDiffViewerShouldBeVisible = observableValue('accessibleDiffViewerShouldBeVisible', false);
 	private _accessibleDiffViewerVisible = derived(reader =>
@@ -162,7 +162,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 		this._register(autorunWithStore((reader, store) => {
 			/** @description UnchangedRangesFeature */
 			this.unchangedRangesFeature = store.add(
-				this._instantiationService.createInstance(readHotReloadableExport(UnchangedRangesFeature, reader), this._editors, this._diffModel, this._options)
+				this._instantiationService.createInstance(readHotReloadableExport(HideUnchangedRegionsFeature, reader), this._editors, this._diffModel, this._options)
 			);
 		}));
 
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/unchangedRanges.ts b/src/vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature.ts
similarity index 91%
rename from src/vs/editor/browser/widget/diffEditorWidget2/unchangedRanges.ts
rename to src/vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature.ts
index a61dc81803b..6c7851b9416 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/unchangedRanges.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature.ts
@@ -6,7 +6,6 @@
 import { $, addDisposableListener, h, reset } from 'vs/base/browser/dom';
 import { renderIcon, renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { compareBy, numberComparator, reverseOrder } from 'vs/base/common/arrays';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Codicon } from 'vs/base/common/codicons';
 import { Event } from 'vs/base/common/event';
 import { MarkdownString } from 'vs/base/common/htmlContent';
@@ -19,7 +18,7 @@ import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditorWidget2/di
 import { DiffEditorOptions } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions';
 import { DiffEditorViewModel, UnchangedRegion } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel';
 import { OutlineModel } from 'vs/editor/browser/widget/diffEditorWidget2/outlineModel';
-import { PlaceholderViewZone, ViewZoneOverlayWidget, applyObservableDecorations, applyStyle, applyViewZones } from 'vs/editor/browser/widget/diffEditorWidget2/utils';
+import { DisposableCancellationTokenSource, PlaceholderViewZone, ViewZoneOverlayWidget, applyObservableDecorations, applyStyle, applyViewZones } from 'vs/editor/browser/widget/diffEditorWidget2/utils';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { Position } from 'vs/editor/common/core/position';
@@ -30,14 +29,12 @@ import { IModelDecorationOptions, IModelDeltaDecoration, ITextModel } from 'vs/e
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { localize } from 'vs/nls';
 
-export class UnchangedRangesFeature extends Disposable {
+export class HideUnchangedRegionsFeature extends Disposable {
 	private _isUpdatingViewZones = false;
 	public get isUpdatingViewZones(): boolean { return this._isUpdatingViewZones; }
 
-	private readonly _modifiedModel = observableFromEvent(this._editors.modified.onDidChangeModel, () => this._editors.modified.getModel());
-
 	private readonly _modifiedOutlineSource = derivedWithStore('modified outline source', (reader, store) => {
-		const m = this._modifiedModel.read(reader);
+		const m = this._editors.modifiedModel.read(reader);
 		if (!m) { return undefined; }
 		return store.add(new OutlineSource(this._languageFeaturesService, m));
 	});
@@ -77,13 +74,13 @@ export class UnchangedRangesFeature extends Disposable {
 		const unchangedRegions = this._diffModel.map((m, reader) => m?.diff.read(reader)?.mappings.length === 0 ? [] : m?.unchangedRegions.read(reader) ?? []);
 
 		const viewZones = derivedWithStore('view zones', (reader, store) => {
+			const modifiedOutlineSource = this._modifiedOutlineSource.read(reader);
+			if (!modifiedOutlineSource) { return { origViewZones: [], modViewZones: [] }; }
+
 			const origViewZones: IViewZone[] = [];
 			const modViewZones: IViewZone[] = [];
 			const sideBySide = this._options.renderSideBySide.read(reader);
 
-			const modifiedOutlineSource = this._modifiedOutlineSource.read(reader);
-			if (!modifiedOutlineSource) { return { origViewZones, modViewZones }; }
-
 			const curUnchangedRegions = unchangedRegions.read(reader);
 			for (const r of curUnchangedRegions) {
 				if (r.shouldHideControls(reader)) {
@@ -94,13 +91,30 @@ export class UnchangedRangesFeature extends Disposable {
 					const d = derived(reader => /** @description hiddenOriginalRangeStart */ r.getHiddenOriginalRange(reader).startLineNumber - 1);
 					const origVz = new PlaceholderViewZone(d, 24);
 					origViewZones.push(origVz);
-					store.add(new CollapsedCodeOverlayWidget(this._editors.original, origVz, r, r.originalRange, !sideBySide, modifiedOutlineSource, l => this._diffModel.get()!.ensureModifiedLineIsVisible(l, undefined), this._options));
+					store.add(new CollapsedCodeOverlayWidget(
+						this._editors.original,
+						origVz,
+						r,
+						r.originalUnchangedRange,
+						!sideBySide,
+						modifiedOutlineSource,
+						l => this._diffModel.get()!.ensureModifiedLineIsVisible(l, undefined),
+						this._options
+					));
 				}
 				{
 					const d = derived(reader => /** @description hiddenModifiedRangeStart */ r.getHiddenModifiedRange(reader).startLineNumber - 1);
 					const modViewZone = new PlaceholderViewZone(d, 24);
 					modViewZones.push(modViewZone);
-					store.add(new CollapsedCodeOverlayWidget(this._editors.modified, modViewZone, r, r.modifiedRange, false, modifiedOutlineSource, l => this._diffModel.get()!.ensureModifiedLineIsVisible(l, undefined), this._options));
+					store.add(new CollapsedCodeOverlayWidget(
+						this._editors.modified,
+						modViewZone,
+						r,
+						r.modifiedUnchangedRange,
+						false,
+						modifiedOutlineSource,
+						l => this._diffModel.get()!.ensureModifiedLineIsVisible(l, undefined), this._options
+					));
 				}
 			}
 
@@ -125,14 +139,14 @@ export class UnchangedRangesFeature extends Disposable {
 			/** @description decorations */
 			const curUnchangedRegions = unchangedRegions.read(reader);
 			const result = curUnchangedRegions.map<IModelDeltaDecoration>(r => ({
-				range: r.originalRange.toInclusiveRange()!,
+				range: r.originalUnchangedRange.toInclusiveRange()!,
 				options: unchangedLinesDecoration,
 			}));
 			for (const r of curUnchangedRegions) {
 				if (r.shouldHideControls(reader)) {
 					result.push({
 						range: Range.fromPositions(new Position(r.originalLineNumber, 1)),
-						options: unchangedLinesDecorationShow
+						options: unchangedLinesDecorationShow,
 					});
 				}
 			}
@@ -143,14 +157,14 @@ export class UnchangedRangesFeature extends Disposable {
 			/** @description decorations */
 			const curUnchangedRegions = unchangedRegions.read(reader);
 			const result = curUnchangedRegions.map<IModelDeltaDecoration>(r => ({
-				range: r.modifiedRange.toInclusiveRange()!,
+				range: r.modifiedUnchangedRange.toInclusiveRange()!,
 				options: unchangedLinesDecoration,
 			}));
 			for (const r of curUnchangedRegions) {
 				if (r.shouldHideControls(reader)) {
 					result.push({
 						range: LineRange.ofLength(r.modifiedLineNumber, 1).toInclusiveRange()!,
-						options: unchangedLinesDecorationShow
+						options: unchangedLinesDecorationShow,
 					});
 				}
 			}
@@ -172,7 +186,7 @@ export class UnchangedRangesFeature extends Disposable {
 				const lineNumber = event.target.position.lineNumber;
 				const model = this._diffModel.get();
 				if (!model) { return; }
-				const region = model.unchangedRegions.get().find(r => r.modifiedRange.includes(lineNumber));
+				const region = model.unchangedRegions.get().find(r => r.modifiedUnchangedRange.includes(lineNumber));
 				if (!region) { return; }
 				region.collapseAll(undefined);
 				event.event.stopPropagation();
@@ -185,7 +199,7 @@ export class UnchangedRangesFeature extends Disposable {
 				const lineNumber = event.target.position.lineNumber;
 				const model = this._diffModel.get();
 				if (!model) { return; }
-				const region = model.unchangedRegions.get().find(r => r.originalRange.includes(lineNumber));
+				const region = model.unchangedRegions.get().find(r => r.originalUnchangedRange.includes(lineNumber));
 				if (!region) { return; }
 				region.collapseAll(undefined);
 				event.event.stopPropagation();
@@ -195,12 +209,6 @@ export class UnchangedRangesFeature extends Disposable {
 	}
 }
 
-class DisposableCancellationTokenSource extends CancellationTokenSource {
-	public override dispose() {
-		super.dispose(true);
-	}
-}
-
 class OutlineSource extends Disposable {
 	private readonly _currentModel = observableValue<OutlineModel | undefined>('current model', undefined);
 
@@ -251,7 +259,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
 		h('div.top@top', { title: localize('diff.hiddenLines.top', 'Click or drag to show more above') }),
 		h('div.center@content', { style: { display: 'flex' } }, [
 			h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } },
-				[$('a', { title: localize('showAll', 'Show all'), role: 'button', onclick: () => { this.showAll(); } }, ...renderLabelWithIcons('$(unfold)'))]
+				[$('a', { title: localize('showAll', 'Show all'), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } },
+					...renderLabelWithIcons('$(unfold)'))]
 			),
 			h('div@others', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center' } }),
 		]),
@@ -370,7 +379,7 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
 				span.addEventListener('dblclick', e => {
 					if (e.button !== 0) { return; }
 					e.preventDefault();
-					this.showAll();
+					this._unchangedRegion.showAll(undefined);
 				});
 				children.push(span);
 
@@ -405,6 +414,4 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
 			reset(this._nodes.others, ...children);
 		}));
 	}
-
-	private showAll() { this._unchangedRegion.showAll(undefined); }
 }
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts b/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts
index e2326b84447..407fbbbb84c 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDimension } from 'vs/base/browser/dom';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { isHotReloadEnabled, registerHotReloadHandler } from 'vs/base/common/hotReload';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IObservable, IReader, ISettableObservable, autorun, autorunHandleChanges, autorunOpts, observableFromEvent, observableSignalFromEvent, observableValue, transaction } from 'vs/base/common/observable';
@@ -369,3 +370,9 @@ export function applyViewZones(editor: ICodeEditor, viewZones: IObservable<IObse
 
 	return store;
 }
+
+export class DisposableCancellationTokenSource extends CancellationTokenSource {
+	public override dispose() {
+		super.dispose(true);
+	}
+}
diff --git a/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts b/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
index 6adb654d142..20486434dc4 100644
--- a/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
+++ b/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
@@ -11,7 +11,7 @@ import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 suite('DiffEditorWidget2', () => {
 	suite('UnchangedRegion', () => {
 		function serialize(regions: UnchangedRegion[]): unknown {
-			return regions.map(r => `${r.originalRange} - ${r.modifiedRange}`);
+			return regions.map(r => `${r.originalUnchangedRange} - ${r.modifiedUnchangedRange}`);
 		}
 
 		test('Everything changed', () => {

From 2fa00ad43eeb5f8b815e0704dc238c6d86e85e5c Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Sat, 2 Sep 2023 17:40:25 +0200
Subject: [PATCH 53/94] Fixes #191983 - Moved Code Should Scan Previous/Next
 Lines

---
 src/vs/base/common/arrays.ts                  |  6 ++
 src/vs/base/common/arraysFind.ts              |  8 +-
 .../diffEditorWidget2/accessibleDiffViewer.ts | 33 +------
 src/vs/editor/common/core/lineRange.ts        |  5 +
 src/vs/editor/common/core/offsetRange.ts      |  6 ++
 .../common/diff/advancedLinesDiffComputer.ts  | 99 +++++++++++++++++++
 .../common/diff/algorithms/diffAlgorithm.ts   | 18 ++++
 7 files changed, 141 insertions(+), 34 deletions(-)

diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index 71bedc3a440..4061404c8ee 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -201,6 +201,12 @@ export function* groupAdjacentBy<T>(items: Iterable<T>, shouldBeGrouped: (item1:
 	}
 }
 
+export function forEachAdjacent<T>(arr: T[], f: (item1: T | undefined, item2: T | undefined) => void): void {
+	for (let i = 0; i <= arr.length; i++) {
+		f(i === 0 ? undefined : arr[i - 1], i === arr.length ? undefined : arr[i]);
+	}
+}
+
 interface IMutableSplice<T> extends ISplice<T> {
 	readonly toInsert: T[];
 	deleteCount: number;
diff --git a/src/vs/base/common/arraysFind.ts b/src/vs/base/common/arraysFind.ts
index 91a1b710823..d40aba8ab67 100644
--- a/src/vs/base/common/arraysFind.ts
+++ b/src/vs/base/common/arraysFind.ts
@@ -81,7 +81,7 @@ export class MonotonousArray<T> {
 	public static assertInvariants = false;
 
 	private _findLastMonotonousLastIdx = 0;
-	private _lastPredicate: ((item: T) => boolean) | undefined;
+	private _prevFindLastPredicate: ((item: T) => boolean) | undefined;
 
 	constructor(private readonly _items: T[]) {
 	}
@@ -92,14 +92,14 @@ export class MonotonousArray<T> {
 	 */
 	findLastMonotonous(predicate: (item: T) => boolean): T | undefined {
 		if (MonotonousArray.assertInvariants) {
-			if (this._lastPredicate) {
+			if (this._prevFindLastPredicate) {
 				for (const item of this._items) {
-					if (this._lastPredicate(item) && !predicate(item)) {
+					if (this._prevFindLastPredicate(item) && !predicate(item)) {
 						throw new Error('MonotonousArray: current predicate must be weaker than (or equal to) the previous predicate.');
 					}
 				}
 			}
-			this._lastPredicate = predicate;
+			this._prevFindLastPredicate = predicate;
 		}
 
 		const idx = findLastIdxMonotonous(this._items, predicate, this._findLastMonotonousLastIdx);
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
index ce188250447..5bb6c97f1e4 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
@@ -7,6 +7,7 @@ import { addDisposableListener, addStandardDisposableListener, reset } from 'vs/
 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 { forEachAdjacent, groupAdjacentBy } from 'vs/base/common/arrays';
 import { Codicon } from 'vs/base/common/codicons';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
@@ -224,7 +225,7 @@ const viewElementGroupLineMargin = 3;
 function computeViewElementGroups(diffs: DetailedLineRangeMapping[], originalLineCount: number, modifiedLineCount: number): ViewElementGroup[] {
 	const result: ViewElementGroup[] = [];
 
-	for (const g of group(diffs, (a, b) => (b.modified.startLineNumber - a.modified.endLineNumberExclusive < 2 * viewElementGroupLineMargin))) {
+	for (const g of groupAdjacentBy(diffs, (a, b) => (b.modified.startLineNumber - a.modified.endLineNumberExclusive < 2 * viewElementGroupLineMargin))) {
 		const viewElements: ViewElement[] = [];
 		viewElements.push(new HeaderViewElement());
 
@@ -237,7 +238,7 @@ function computeViewElementGroups(diffs: DetailedLineRangeMapping[], originalLin
 			Math.min(g[g.length - 1].modified.endLineNumberExclusive + viewElementGroupLineMargin, modifiedLineCount + 1)
 		);
 
-		forEachAdjacentItems(g, (a, b) => {
+		forEachAdjacent(g, (a, b) => {
 			const origRange = new LineRange(a ? a.original.endLineNumberExclusive : origFullRange.startLineNumber, b ? b.original.startLineNumber : origFullRange.endLineNumberExclusive);
 			const modifiedRange = new LineRange(a ? a.modified.endLineNumberExclusive : modifiedFullRange.startLineNumber, b ? b.modified.startLineNumber : modifiedFullRange.endLineNumberExclusive);
 
@@ -659,31 +660,3 @@ class View extends Disposable {
 		return r.html;
 	}
 }
-
-function forEachAdjacentItems<T>(items: T[], callback: (item1: T | undefined, item2: T | undefined) => void) {
-	let last: T | undefined;
-	for (const item of items) {
-		callback(last, item);
-		last = item;
-	}
-	callback(last, undefined);
-}
-
-function* group<T>(items: Iterable<T>, shouldBeGrouped: (item1: T, item2: T) => boolean): Iterable<T[]> {
-	let currentGroup: T[] | undefined;
-	let last: T | undefined;
-	for (const item of items) {
-		if (last !== undefined && shouldBeGrouped(last, item)) {
-			currentGroup!.push(item);
-		} else {
-			if (currentGroup) {
-				yield currentGroup;
-			}
-			currentGroup = [item];
-		}
-		last = item;
-	}
-	if (currentGroup) {
-		yield currentGroup;
-	}
-}
diff --git a/src/vs/editor/common/core/lineRange.ts b/src/vs/editor/common/core/lineRange.ts
index 3bf932cac4d..6a99f241df0 100644
--- a/src/vs/editor/common/core/lineRange.ts
+++ b/src/vs/editor/common/core/lineRange.ts
@@ -240,6 +240,11 @@ export class LineRangeSet {
 		}
 	}
 
+	contains(lineNumber: number): boolean {
+		const rangeThatStartsBeforeEnd = findLastMonotonous(this._normalizedRanges, r => r.startLineNumber <= lineNumber);
+		return !!rangeThatStartsBeforeEnd && rangeThatStartsBeforeEnd.endLineNumberExclusive > lineNumber;
+	}
+
 	intersects(range: LineRange): boolean {
 		const rangeThatStartsBeforeEnd = findLastMonotonous(this._normalizedRanges, r => r.startLineNumber < range.endLineNumberExclusive);
 		return !!rangeThatStartsBeforeEnd && rangeThatStartsBeforeEnd.endLineNumberExclusive > range.startLineNumber;
diff --git a/src/vs/editor/common/core/offsetRange.ts b/src/vs/editor/common/core/offsetRange.ts
index 9173e5339bb..64c29063206 100644
--- a/src/vs/editor/common/core/offsetRange.ts
+++ b/src/vs/editor/common/core/offsetRange.ts
@@ -144,6 +144,12 @@ export class OffsetRange {
 		}
 		return result;
 	}
+
+	public forEach(f: (offset: number) => void): void {
+		for (let i = this.start; i < this.endExclusive; i++) {
+			f(i);
+		}
+	}
 }
 
 export class OffsetRangeSet {
diff --git a/src/vs/editor/common/diff/advancedLinesDiffComputer.ts b/src/vs/editor/common/diff/advancedLinesDiffComputer.ts
index 8720d8524ba..c5d597137f1 100644
--- a/src/vs/editor/common/diff/advancedLinesDiffComputer.ts
+++ b/src/vs/editor/common/diff/advancedLinesDiffComputer.ts
@@ -195,6 +195,8 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 			changes.filter(c => !excludedChanges.has(c)),
 			hashedOriginalLines,
 			hashedModifiedLines,
+			originalLines,
+			modifiedLines,
 			timeout
 		);
 		pushMany(moves, unchangedMoves);
@@ -297,6 +299,8 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 		changes: DetailedLineRangeMapping[],
 		hashedOriginalLines: number[],
 		hashedModifiedLines: number[],
+		originalLines: string[],
+		modifiedLines: string[],
 		timeout: ITimeout,
 	) {
 		const moves: LineRangeMapping[] = [];
@@ -380,9 +384,104 @@ export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
 			}
 		}
 
+		moves.sort(compareBy(m => m.original.startLineNumber, numberComparator));
+
+		const monotonousChanges = new MonotonousArray(changes);
+		for (let i = 0; i < moves.length; i++) {
+			const move = moves[i];
+			const firstTouchingChangeOrig = monotonousChanges.findLastMonotonous(c => c.original.startLineNumber <= move.original.startLineNumber)!;
+			const firstTouchingChangeMod = findLastMonotonous(changes, c => c.modified.startLineNumber <= move.modified.startLineNumber)!;
+			const linesAbove = Math.max(
+				move.original.startLineNumber - firstTouchingChangeOrig.original.startLineNumber,
+				move.modified.startLineNumber - firstTouchingChangeMod.modified.startLineNumber
+			);
+
+			const lastTouchingChangeOrig = monotonousChanges.findLastMonotonous(c => c.original.startLineNumber < move.original.endLineNumberExclusive)!;
+			const lastTouchingChangeMod = findLastMonotonous(changes, c => c.modified.startLineNumber < move.modified.endLineNumberExclusive)!;
+			const linesBelow = Math.max(
+				lastTouchingChangeOrig.original.endLineNumberExclusive - move.original.endLineNumberExclusive,
+				lastTouchingChangeMod.modified.endLineNumberExclusive - move.modified.endLineNumberExclusive
+			);
+
+			let extendToTop: number;
+			for (extendToTop = 0; extendToTop < linesAbove; extendToTop++) {
+				const origLine = move.original.startLineNumber - extendToTop - 1;
+				const modLine = move.modified.startLineNumber - extendToTop - 1;
+				if (modifiedSet.contains(modLine) || originalSet.contains(origLine)) {
+					break;
+				}
+				if (!this.areLinesSimilar(originalLines[origLine - 1], modifiedLines[modLine - 1], timeout)) {
+					break;
+				}
+			}
+
+			if (extendToTop > 0) {
+				originalSet.addRange(new LineRange(move.original.startLineNumber - extendToTop, move.original.startLineNumber));
+				modifiedSet.addRange(new LineRange(move.modified.startLineNumber - extendToTop, move.modified.startLineNumber));
+			}
+
+			let extendToBottom: number;
+			for (extendToBottom = 0; extendToBottom < linesBelow; extendToBottom++) {
+				const origLine = move.original.endLineNumberExclusive + extendToBottom;
+				const modLine = move.modified.endLineNumberExclusive + extendToBottom;
+				if (modifiedSet.contains(modLine) || originalSet.contains(origLine)) {
+					break;
+				}
+				if (!this.areLinesSimilar(originalLines[origLine - 1], modifiedLines[modLine - 1], timeout)) {
+					break;
+				}
+			}
+
+			if (extendToBottom > 0) {
+				originalSet.addRange(new LineRange(move.original.endLineNumberExclusive, move.original.endLineNumberExclusive + extendToBottom));
+				modifiedSet.addRange(new LineRange(move.modified.endLineNumberExclusive, move.modified.endLineNumberExclusive + extendToBottom));
+			}
+
+			if (extendToTop > 0 || extendToBottom > 0) {
+				moves[i] = new LineRangeMapping(
+					new LineRange(move.original.startLineNumber - extendToTop, move.original.endLineNumberExclusive + extendToBottom),
+					new LineRange(move.modified.startLineNumber - extendToTop, move.modified.endLineNumberExclusive + extendToBottom),
+				);
+			}
+		}
+
 		return moves;
 	}
 
+	private areLinesSimilar(line1: string, line2: string, timeout: ITimeout): boolean {
+		if (line1.trim() === line2.trim()) { return true; }
+		if (line1.length > 300 && line2.length > 300) { return false; }
+
+		const result = this.myersDiffingAlgorithm.compute(
+			new LinesSliceCharSequence([line1], new OffsetRange(0, 1), false),
+			new LinesSliceCharSequence([line2], new OffsetRange(0, 1), false),
+			timeout
+		);
+		let commonNonSpaceCharCount = 0;
+		const inverted = SequenceDiff.invert(result.diffs, line1.length);
+		for (const seq of inverted) {
+			seq.seq1Range.forEach(idx => {
+				if (!isSpace(line1.charCodeAt(idx))) {
+					commonNonSpaceCharCount++;
+				}
+			});
+		}
+
+		function countNonWsChars(str: string): number {
+			let count = 0;
+			for (let i = 0; i < line1.length; i++) {
+				if (!isSpace(str.charCodeAt(i))) {
+					count++;
+				}
+			}
+			return count;
+		}
+
+		const longerLineLength = countNonWsChars(line1.length > line2.length ? line1 : line2);
+		const r = commonNonSpaceCharCount / longerLineLength > 0.6 && longerLineLength > 10;
+		return r;
+	}
+
 	private refineDiff(originalLines: string[], modifiedLines: string[], diff: SequenceDiff, timeout: ITimeout, considerWhitespaceChanges: boolean): { mappings: RangeMapping[]; hitTimeout: boolean } {
 		const slice1 = new LinesSliceCharSequence(originalLines, diff.seq1Range, considerWhitespaceChanges);
 		const slice2 = new LinesSliceCharSequence(modifiedLines, diff.seq2Range, considerWhitespaceChanges);
diff --git a/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts b/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts
index ce23a58ceb3..c38a84c2845 100644
--- a/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts
+++ b/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { forEachAdjacent } from 'vs/base/common/arrays';
 import { BugIndicatingError } from 'vs/base/common/errors';
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
 
@@ -33,6 +34,23 @@ export class DiffAlgorithmResult {
 }
 
 export class SequenceDiff {
+	public static invert(sequenceDiffs: SequenceDiff[], doc1Length: number): SequenceDiff[] {
+		const result: SequenceDiff[] = [];
+
+		forEachAdjacent(sequenceDiffs, (a, b) => {
+			const seq1Start = a ? a.seq1Range.endExclusive : 0;
+			const seq2Start = a ? a.seq2Range.endExclusive : 0;
+			const seq1EndEx = b ? b.seq1Range.start : doc1Length;
+			const seq2EndEx = b ? b.seq2Range.start : (a ? a.seq2Range.endExclusive - a.seq1Range.endExclusive : 0) + doc1Length;
+			result.push(new SequenceDiff(
+				new OffsetRange(seq1Start, seq1EndEx),
+				new OffsetRange(seq2Start, seq2EndEx),
+			));
+		});
+
+		return result;
+	}
+
 	constructor(
 		public readonly seq1Range: OffsetRange,
 		public readonly seq2Range: OffsetRange,

From e80db1ae0acf5c79eb39905e34fee7a4460001be Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 4 Sep 2023 09:42:52 +0200
Subject: [PATCH 54/94] Refactors diff algorithm

---
 .../diffEditorWidget2/diffEditorViewModel.ts  |   4 +-
 .../common/diff/advancedLinesDiffComputer.ts  | 971 ------------------
 src/vs/editor/common/diff/algorithms/utils.ts |  20 -
 .../algorithms/diffAlgorithm.ts               |   2 +-
 .../algorithms/dynamicProgrammingDiffing.ts   |   4 +-
 .../algorithms/myersDiffAlgorithm.ts          |   2 +-
 .../defaultLinesDiffComputer/computeMoves.ts  | 314 ++++++
 .../defaultLinesDiffComputer.ts               | 310 ++++++
 .../heuristicSequenceOptimizations.ts}        | 429 +++++---
 .../defaultLinesDiffComputer/lineSequence.ts  |  45 +
 .../linesSliceCharSequence.ts                 | 217 ++++
 .../diff/defaultLinesDiffComputer/utils.ts    |  74 ++
 .../editor/common/diff/linesDiffComputers.ts  |   7 +-
 src/vs/editor/common/diff/rangeMapping.ts     |   5 +-
 .../common/services/editorSimpleWorker.ts     |   4 +-
 .../diffing/advancedLinesDiffComputer.test.ts |   2 +-
 .../test/node/diffing/diffingFixture.test.ts  |   4 +-
 src/vs/monaco.d.ts                            |   4 +
 18 files changed, 1245 insertions(+), 1173 deletions(-)
 delete mode 100644 src/vs/editor/common/diff/advancedLinesDiffComputer.ts
 delete mode 100644 src/vs/editor/common/diff/algorithms/utils.ts
 rename src/vs/editor/common/diff/{ => defaultLinesDiffComputer}/algorithms/diffAlgorithm.ts (99%)
 rename src/vs/editor/common/diff/{ => defaultLinesDiffComputer}/algorithms/dynamicProgrammingDiffing.ts (95%)
 rename src/vs/editor/common/diff/{ => defaultLinesDiffComputer}/algorithms/myersDiffAlgorithm.ts (97%)
 create mode 100644 src/vs/editor/common/diff/defaultLinesDiffComputer/computeMoves.ts
 create mode 100644 src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
 rename src/vs/editor/common/diff/{algorithms/joinSequenceDiffs.ts => defaultLinesDiffComputer/heuristicSequenceOptimizations.ts} (72%)
 create mode 100644 src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.ts
 create mode 100644 src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
 create mode 100644 src/vs/editor/common/diff/defaultLinesDiffComputer/utils.ts

diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
index dd4714d7173..30697f69a85 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
@@ -9,7 +9,7 @@ import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IObservable, IReader, ISettableObservable, ITransaction, autorunWithStore, derived, observableSignal, observableSignalFromEvent, observableValue, transaction, waitForState } from 'vs/base/common/observable';
 import { readHotReloadableExport } from 'vs/editor/browser/widget/diffEditorWidget2/utils';
 import { ISerializedLineRange, LineRange } from 'vs/editor/common/core/lineRange';
-import { AdvancedLinesDiffComputer } from 'vs/editor/common/diff/advancedLinesDiffComputer';
+import { DefaultLinesDiffComputer } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
 import { IDocumentDiff, IDocumentDiffProvider } from 'vs/editor/common/diff/documentDiffProvider';
 import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
 import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
@@ -175,7 +175,7 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 			debouncer.cancel();
 			contentChangedSignal.read(reader);
 			documentDiffProviderOptionChanged.read(reader);
-			readHotReloadableExport(AdvancedLinesDiffComputer, reader);
+			readHotReloadableExport(DefaultLinesDiffComputer, reader);
 
 			this._isDiffUpToDate.set(false, undefined);
 
diff --git a/src/vs/editor/common/diff/advancedLinesDiffComputer.ts b/src/vs/editor/common/diff/advancedLinesDiffComputer.ts
deleted file mode 100644
index c5d597137f1..00000000000
--- a/src/vs/editor/common/diff/advancedLinesDiffComputer.ts
+++ /dev/null
@@ -1,971 +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 { compareBy, equals, groupAdjacentBy, numberComparator, pushMany, reverseOrder } from 'vs/base/common/arrays';
-import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
-import { CharCode } from 'vs/base/common/charCode';
-import { SetMap } from 'vs/base/common/collections';
-import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
-import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { DateTimeout, ISequence, ITimeout, InfiniteTimeout, SequenceDiff } from 'vs/editor/common/diff/algorithms/diffAlgorithm';
-import { DynamicProgrammingDiffing } from 'vs/editor/common/diff/algorithms/dynamicProgrammingDiffing';
-import { optimizeSequenceDiffs, removeRandomLineMatches, removeRandomMatches, smoothenSequenceDiffs } from 'vs/editor/common/diff/algorithms/joinSequenceDiffs';
-import { MyersDiffAlgorithm } from 'vs/editor/common/diff/algorithms/myersDiffAlgorithm';
-import { ILinesDiffComputer, ILinesDiffComputerOptions, LinesDiff, MovedText } from 'vs/editor/common/diff/linesDiffComputer';
-import { DetailedLineRangeMapping, LineRangeMapping, RangeMapping } from './rangeMapping';
-import { MonotonousArray, findLastIdxMonotonous, findLastMonotonous, findFirstMonotonous } from 'vs/base/common/arraysFind';
-
-export class AdvancedLinesDiffComputer implements ILinesDiffComputer {
-	private readonly dynamicProgrammingDiffing = new DynamicProgrammingDiffing();
-	private readonly myersDiffingAlgorithm = new MyersDiffAlgorithm();
-
-	computeDiff(originalLines: string[], modifiedLines: string[], options: ILinesDiffComputerOptions): LinesDiff {
-		if (originalLines.length <= 1 && equals(originalLines, modifiedLines, (a, b) => a === b)) {
-			return new LinesDiff([], [], false);
-		}
-
-		if (originalLines.length === 1 && originalLines[0].length === 0 || modifiedLines.length === 1 && modifiedLines[0].length === 0) {
-			return new LinesDiff([
-				new DetailedLineRangeMapping(
-					new LineRange(1, originalLines.length + 1),
-					new LineRange(1, modifiedLines.length + 1),
-					[
-						new RangeMapping(
-							new Range(1, 1, originalLines.length, originalLines[0].length + 1),
-							new Range(1, 1, modifiedLines.length, modifiedLines[0].length + 1)
-						)
-					]
-				)
-			], [], false);
-		}
-
-		const timeout = options.maxComputationTimeMs === 0 ? InfiniteTimeout.instance : new DateTimeout(options.maxComputationTimeMs);
-		const considerWhitespaceChanges = !options.ignoreTrimWhitespace;
-
-		const perfectHashes = new Map<string, number>();
-		function getOrCreateHash(text: string): number {
-			let hash = perfectHashes.get(text);
-			if (hash === undefined) {
-				hash = perfectHashes.size;
-				perfectHashes.set(text, hash);
-			}
-			return hash;
-		}
-
-		const srcDocLines = originalLines.map((l) => getOrCreateHash(l.trim()));
-		const tgtDocLines = modifiedLines.map((l) => getOrCreateHash(l.trim()));
-
-		const sequence1 = new LineSequence(srcDocLines, originalLines);
-		const sequence2 = new LineSequence(tgtDocLines, modifiedLines);
-
-		const lineAlignmentResult = (() => {
-			if (sequence1.length + sequence2.length < 1700) {
-				// Use the improved algorithm for small files
-				return this.dynamicProgrammingDiffing.compute(
-					sequence1,
-					sequence2,
-					timeout,
-					(offset1, offset2) =>
-						originalLines[offset1] === modifiedLines[offset2]
-							? modifiedLines[offset2].length === 0
-								? 0.1
-								: 1 + Math.log(1 + modifiedLines[offset2].length)
-							: 0.99
-				);
-			}
-
-			return this.myersDiffingAlgorithm.compute(
-				sequence1,
-				sequence2
-			);
-		})();
-
-		let lineAlignments = lineAlignmentResult.diffs;
-		let hitTimeout = lineAlignmentResult.hitTimeout;
-		lineAlignments = optimizeSequenceDiffs(sequence1, sequence2, lineAlignments);
-		lineAlignments = removeRandomLineMatches(sequence1, sequence2, lineAlignments);
-
-		const alignments: RangeMapping[] = [];
-
-		const scanForWhitespaceChanges = (equalLinesCount: number) => {
-			if (!considerWhitespaceChanges) {
-				return;
-			}
-
-			for (let i = 0; i < equalLinesCount; i++) {
-				const seq1Offset = seq1LastStart + i;
-				const seq2Offset = seq2LastStart + i;
-				if (originalLines[seq1Offset] !== modifiedLines[seq2Offset]) {
-					// This is because of whitespace changes, diff these lines
-					const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(
-						new OffsetRange(seq1Offset, seq1Offset + 1),
-						new OffsetRange(seq2Offset, seq2Offset + 1),
-					), timeout, considerWhitespaceChanges);
-					for (const a of characterDiffs.mappings) {
-						alignments.push(a);
-					}
-					if (characterDiffs.hitTimeout) {
-						hitTimeout = true;
-					}
-				}
-			}
-		};
-
-		let seq1LastStart = 0;
-		let seq2LastStart = 0;
-
-		for (const diff of lineAlignments) {
-			assertFn(() => diff.seq1Range.start - seq1LastStart === diff.seq2Range.start - seq2LastStart);
-
-			const equalLinesCount = diff.seq1Range.start - seq1LastStart;
-
-			scanForWhitespaceChanges(equalLinesCount);
-
-			seq1LastStart = diff.seq1Range.endExclusive;
-			seq2LastStart = diff.seq2Range.endExclusive;
-
-			const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges);
-			if (characterDiffs.hitTimeout) {
-				hitTimeout = true;
-			}
-			for (const a of characterDiffs.mappings) {
-				alignments.push(a);
-			}
-		}
-
-		scanForWhitespaceChanges(originalLines.length - seq1LastStart);
-
-		const changes = lineRangeMappingFromRangeMappings(alignments, originalLines, modifiedLines);
-
-		let moves: MovedText[] = [];
-		if (options.computeMoves) {
-			moves = this.computeMoves(changes, originalLines, modifiedLines, srcDocLines, tgtDocLines, timeout, considerWhitespaceChanges);
-		}
-
-		// Make sure all ranges are valid
-		assertFn(() => {
-			function validatePosition(pos: Position, lines: string[]): boolean {
-				if (pos.lineNumber < 1 || pos.lineNumber > lines.length) { return false; }
-				const line = lines[pos.lineNumber - 1];
-				if (pos.column < 1 || pos.column > line.length + 1) { return false; }
-				return true;
-			}
-
-			function validateRange(range: LineRange, lines: string[]): boolean {
-				if (range.startLineNumber < 1 || range.startLineNumber > lines.length + 1) { return false; }
-				if (range.endLineNumberExclusive < 1 || range.endLineNumberExclusive > lines.length + 1) { return false; }
-				return true;
-			}
-
-			for (const c of changes) {
-				if (!c.innerChanges) { return false; }
-				for (const ic of c.innerChanges) {
-					const valid = validatePosition(ic.modifiedRange.getStartPosition(), modifiedLines) && validatePosition(ic.modifiedRange.getEndPosition(), modifiedLines) &&
-						validatePosition(ic.originalRange.getStartPosition(), originalLines) && validatePosition(ic.originalRange.getEndPosition(), originalLines);
-					if (!valid) { return false; }
-				}
-				if (!validateRange(c.modified, modifiedLines) || !validateRange(c.original, originalLines)) {
-					return false;
-				}
-			}
-			return true;
-		});
-
-		return new LinesDiff(changes, moves, hitTimeout);
-	}
-
-	private computeMoves(
-		changes: DetailedLineRangeMapping[],
-		originalLines: string[],
-		modifiedLines: string[],
-		hashedOriginalLines: number[],
-		hashedModifiedLines: number[],
-		timeout: ITimeout,
-		considerWhitespaceChanges: boolean,
-	): MovedText[] {
-		const { moves, excludedChanges } = this.computeMovesFromSimpleDeletionsToSimpleInsertions(changes, originalLines, modifiedLines, timeout);
-
-		if (!timeout.isValid()) { return []; }
-
-		const unchangedMoves = this.computeUnchangedMoves(
-			changes.filter(c => !excludedChanges.has(c)),
-			hashedOriginalLines,
-			hashedModifiedLines,
-			originalLines,
-			modifiedLines,
-			timeout
-		);
-		pushMany(moves, unchangedMoves);
-
-		// join moves
-		moves.sort(compareBy(m => m.original.startLineNumber, numberComparator));
-		if (moves.length === 0) {
-			return [];
-		}
-		let joinedMoves = [moves[0]];
-		for (let i = 1; i < moves.length; i++) {
-			const last = joinedMoves[joinedMoves.length - 1];
-			const current = moves[i];
-
-			const originalDist = current.original.startLineNumber - last.original.endLineNumberExclusive;
-			const modifiedDist = current.modified.startLineNumber - last.modified.endLineNumberExclusive;
-			const currentMoveAfterLast = originalDist >= 0 && modifiedDist >= 0;
-
-			if (currentMoveAfterLast && originalDist + modifiedDist <= 2) {
-				joinedMoves[joinedMoves.length - 1] = last.join(current);
-				continue;
-			}
-
-			const originalText = current.original.toOffsetRange().slice(originalLines).map(l => l.trim()).join('\n');
-			if (originalText.length <= 10) {
-				// Ignore small moves
-				continue;
-			}
-			joinedMoves.push(current);
-		}
-
-		// Ignore non moves
-		const changesMonotonous = new MonotonousArray(changes);
-		joinedMoves = joinedMoves.filter(m => {
-			const diffBeforeOriginalMove = changesMonotonous.findLastMonotonous(c => c.original.endLineNumberExclusive <= m.original.startLineNumber)
-				|| new LineRangeMapping(new LineRange(1, 1), new LineRange(1, 1));
-
-			const modifiedDistToPrevDiff = m.modified.startLineNumber - diffBeforeOriginalMove.modified.endLineNumberExclusive;
-			const originalDistToPrevDiff = m.original.startLineNumber - diffBeforeOriginalMove.original.endLineNumberExclusive;
-
-			const differentDistances = modifiedDistToPrevDiff !== originalDistToPrevDiff;
-			return differentDistances;
-		});
-
-		const movesWithDiffs = joinedMoves.map(m => {
-			const moveChanges = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(
-				m.original.toOffsetRange(),
-				m.modified.toOffsetRange(),
-			), timeout, considerWhitespaceChanges);
-			const mappings = lineRangeMappingFromRangeMappings(moveChanges.mappings, originalLines, modifiedLines, true);
-			return new MovedText(m, mappings);
-		});
-		return movesWithDiffs;
-	}
-
-	private computeMovesFromSimpleDeletionsToSimpleInsertions(
-		changes: DetailedLineRangeMapping[],
-		originalLines: string[],
-		modifiedLines: string[],
-		timeout: ITimeout,
-	) {
-		const moves: LineRangeMapping[] = [];
-
-		const deletions = changes
-			.filter(c => c.modified.isEmpty && c.original.length >= 3)
-			.map(d => new LineRangeFragment(d.original, originalLines, d));
-		const insertions = new Set(changes
-			.filter(c => c.original.isEmpty && c.modified.length >= 3)
-			.map(d => new LineRangeFragment(d.modified, modifiedLines, d)));
-
-		const excludedChanges = new Set<DetailedLineRangeMapping>();
-
-		for (const deletion of deletions) {
-			let highestSimilarity = -1;
-			let best: LineRangeFragment | undefined;
-			for (const insertion of insertions) {
-				const similarity = deletion.computeSimilarity(insertion);
-				if (similarity > highestSimilarity) {
-					highestSimilarity = similarity;
-					best = insertion;
-				}
-			}
-
-			if (highestSimilarity > 0.90 && best) {
-				insertions.delete(best);
-				moves.push(new LineRangeMapping(deletion.range, best.range));
-				excludedChanges.add(deletion.source);
-				excludedChanges.add(best.source);
-			}
-
-			if (!timeout.isValid()) {
-				return { moves, excludedChanges };
-			}
-		}
-
-		return { moves, excludedChanges };
-	}
-
-	private computeUnchangedMoves(
-		changes: DetailedLineRangeMapping[],
-		hashedOriginalLines: number[],
-		hashedModifiedLines: number[],
-		originalLines: string[],
-		modifiedLines: string[],
-		timeout: ITimeout,
-	) {
-		const moves: LineRangeMapping[] = [];
-
-		const original3LineHashes = new SetMap<string, { range: LineRange }>();
-
-		for (const change of changes) {
-			for (let i = change.original.startLineNumber; i < change.original.endLineNumberExclusive - 2; i++) {
-				const key = `${hashedOriginalLines[i - 1]}:${hashedOriginalLines[i + 1 - 1]}:${hashedOriginalLines[i + 2 - 1]}`;
-				original3LineHashes.add(key, { range: new LineRange(i, i + 3) });
-			}
-		}
-
-		interface PossibleMapping {
-			modifiedLineRange: LineRange;
-			originalLineRange: LineRange;
-		}
-
-		const possibleMappings: PossibleMapping[] = [];
-
-		changes.sort(compareBy(c => c.modified.startLineNumber, numberComparator));
-
-		for (const change of changes) {
-			let lastMappings: PossibleMapping[] = [];
-			for (let i = change.modified.startLineNumber; i < change.modified.endLineNumberExclusive - 2; i++) {
-				const key = `${hashedModifiedLines[i - 1]}:${hashedModifiedLines[i + 1 - 1]}:${hashedModifiedLines[i + 2 - 1]}`;
-				const currentModifiedRange = new LineRange(i, i + 3);
-
-				const nextMappings: PossibleMapping[] = [];
-				original3LineHashes.forEach(key, ({ range }) => {
-					for (const lastMapping of lastMappings) {
-						// does this match extend some last match?
-						if (lastMapping.originalLineRange.endLineNumberExclusive + 1 === range.endLineNumberExclusive &&
-							lastMapping.modifiedLineRange.endLineNumberExclusive + 1 === currentModifiedRange.endLineNumberExclusive) {
-							lastMapping.originalLineRange = new LineRange(lastMapping.originalLineRange.startLineNumber, range.endLineNumberExclusive);
-							lastMapping.modifiedLineRange = new LineRange(lastMapping.modifiedLineRange.startLineNumber, currentModifiedRange.endLineNumberExclusive);
-							nextMappings.push(lastMapping);
-							return;
-						}
-					}
-
-					const mapping: PossibleMapping = {
-						modifiedLineRange: currentModifiedRange,
-						originalLineRange: range,
-					};
-					possibleMappings.push(mapping);
-					nextMappings.push(mapping);
-				});
-				lastMappings = nextMappings;
-			}
-
-			if (!timeout.isValid()) {
-				return [];
-			}
-		}
-
-		possibleMappings.sort(reverseOrder(compareBy(m => m.modifiedLineRange.length, numberComparator)));
-
-		const modifiedSet = new LineRangeSet();
-		const originalSet = new LineRangeSet();
-
-		for (const mapping of possibleMappings) {
-
-			const diffOrigToMod = mapping.modifiedLineRange.startLineNumber - mapping.originalLineRange.startLineNumber;
-			const modifiedSections = modifiedSet.subtractFrom(mapping.modifiedLineRange);
-			const originalTranslatedSections = originalSet.subtractFrom(mapping.originalLineRange).getWithDelta(diffOrigToMod);
-
-			const modifiedIntersectedSections = modifiedSections.getIntersection(originalTranslatedSections);
-
-			for (const s of modifiedIntersectedSections.ranges) {
-				if (s.length < 3) {
-					continue;
-				}
-				const modifiedLineRange = s;
-				const originalLineRange = s.delta(-diffOrigToMod);
-
-				moves.push(new LineRangeMapping(originalLineRange, modifiedLineRange));
-
-				modifiedSet.addRange(modifiedLineRange);
-				originalSet.addRange(originalLineRange);
-			}
-		}
-
-		moves.sort(compareBy(m => m.original.startLineNumber, numberComparator));
-
-		const monotonousChanges = new MonotonousArray(changes);
-		for (let i = 0; i < moves.length; i++) {
-			const move = moves[i];
-			const firstTouchingChangeOrig = monotonousChanges.findLastMonotonous(c => c.original.startLineNumber <= move.original.startLineNumber)!;
-			const firstTouchingChangeMod = findLastMonotonous(changes, c => c.modified.startLineNumber <= move.modified.startLineNumber)!;
-			const linesAbove = Math.max(
-				move.original.startLineNumber - firstTouchingChangeOrig.original.startLineNumber,
-				move.modified.startLineNumber - firstTouchingChangeMod.modified.startLineNumber
-			);
-
-			const lastTouchingChangeOrig = monotonousChanges.findLastMonotonous(c => c.original.startLineNumber < move.original.endLineNumberExclusive)!;
-			const lastTouchingChangeMod = findLastMonotonous(changes, c => c.modified.startLineNumber < move.modified.endLineNumberExclusive)!;
-			const linesBelow = Math.max(
-				lastTouchingChangeOrig.original.endLineNumberExclusive - move.original.endLineNumberExclusive,
-				lastTouchingChangeMod.modified.endLineNumberExclusive - move.modified.endLineNumberExclusive
-			);
-
-			let extendToTop: number;
-			for (extendToTop = 0; extendToTop < linesAbove; extendToTop++) {
-				const origLine = move.original.startLineNumber - extendToTop - 1;
-				const modLine = move.modified.startLineNumber - extendToTop - 1;
-				if (modifiedSet.contains(modLine) || originalSet.contains(origLine)) {
-					break;
-				}
-				if (!this.areLinesSimilar(originalLines[origLine - 1], modifiedLines[modLine - 1], timeout)) {
-					break;
-				}
-			}
-
-			if (extendToTop > 0) {
-				originalSet.addRange(new LineRange(move.original.startLineNumber - extendToTop, move.original.startLineNumber));
-				modifiedSet.addRange(new LineRange(move.modified.startLineNumber - extendToTop, move.modified.startLineNumber));
-			}
-
-			let extendToBottom: number;
-			for (extendToBottom = 0; extendToBottom < linesBelow; extendToBottom++) {
-				const origLine = move.original.endLineNumberExclusive + extendToBottom;
-				const modLine = move.modified.endLineNumberExclusive + extendToBottom;
-				if (modifiedSet.contains(modLine) || originalSet.contains(origLine)) {
-					break;
-				}
-				if (!this.areLinesSimilar(originalLines[origLine - 1], modifiedLines[modLine - 1], timeout)) {
-					break;
-				}
-			}
-
-			if (extendToBottom > 0) {
-				originalSet.addRange(new LineRange(move.original.endLineNumberExclusive, move.original.endLineNumberExclusive + extendToBottom));
-				modifiedSet.addRange(new LineRange(move.modified.endLineNumberExclusive, move.modified.endLineNumberExclusive + extendToBottom));
-			}
-
-			if (extendToTop > 0 || extendToBottom > 0) {
-				moves[i] = new LineRangeMapping(
-					new LineRange(move.original.startLineNumber - extendToTop, move.original.endLineNumberExclusive + extendToBottom),
-					new LineRange(move.modified.startLineNumber - extendToTop, move.modified.endLineNumberExclusive + extendToBottom),
-				);
-			}
-		}
-
-		return moves;
-	}
-
-	private areLinesSimilar(line1: string, line2: string, timeout: ITimeout): boolean {
-		if (line1.trim() === line2.trim()) { return true; }
-		if (line1.length > 300 && line2.length > 300) { return false; }
-
-		const result = this.myersDiffingAlgorithm.compute(
-			new LinesSliceCharSequence([line1], new OffsetRange(0, 1), false),
-			new LinesSliceCharSequence([line2], new OffsetRange(0, 1), false),
-			timeout
-		);
-		let commonNonSpaceCharCount = 0;
-		const inverted = SequenceDiff.invert(result.diffs, line1.length);
-		for (const seq of inverted) {
-			seq.seq1Range.forEach(idx => {
-				if (!isSpace(line1.charCodeAt(idx))) {
-					commonNonSpaceCharCount++;
-				}
-			});
-		}
-
-		function countNonWsChars(str: string): number {
-			let count = 0;
-			for (let i = 0; i < line1.length; i++) {
-				if (!isSpace(str.charCodeAt(i))) {
-					count++;
-				}
-			}
-			return count;
-		}
-
-		const longerLineLength = countNonWsChars(line1.length > line2.length ? line1 : line2);
-		const r = commonNonSpaceCharCount / longerLineLength > 0.6 && longerLineLength > 10;
-		return r;
-	}
-
-	private refineDiff(originalLines: string[], modifiedLines: string[], diff: SequenceDiff, timeout: ITimeout, considerWhitespaceChanges: boolean): { mappings: RangeMapping[]; hitTimeout: boolean } {
-		const slice1 = new LinesSliceCharSequence(originalLines, diff.seq1Range, considerWhitespaceChanges);
-		const slice2 = new LinesSliceCharSequence(modifiedLines, diff.seq2Range, considerWhitespaceChanges);
-
-		const diffResult = slice1.length + slice2.length < 500
-			? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout)
-			: this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
-
-		let diffs = diffResult.diffs;
-		diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
-		diffs = coverFullWords(slice1, slice2, diffs);
-		diffs = smoothenSequenceDiffs(slice1, slice2, diffs);
-		diffs = removeRandomMatches(slice1, slice2, diffs);
-
-		const result = diffs.map(
-			(d) =>
-				new RangeMapping(
-					slice1.translateRange(d.seq1Range),
-					slice2.translateRange(d.seq2Range)
-				)
-		);
-
-		// Assert: result applied on original should be the same as diff applied to original
-
-		return {
-			mappings: result,
-			hitTimeout: diffResult.hitTimeout,
-		};
-	}
-}
-
-function coverFullWords(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
-	const additional: SequenceDiff[] = [];
-
-	let lastModifiedWord: { added: number; deleted: number; count: number; s1Range: OffsetRange; s2Range: OffsetRange } | undefined = undefined;
-
-	function maybePushWordToAdditional() {
-		if (!lastModifiedWord) {
-			return;
-		}
-
-		const originalLength1 = lastModifiedWord.s1Range.length - lastModifiedWord.deleted;
-		const originalLength2 = lastModifiedWord.s2Range.length - lastModifiedWord.added;
-		if (originalLength1 !== originalLength2) {
-			// TODO figure out why this happens
-		}
-
-		if (Math.max(lastModifiedWord.deleted, lastModifiedWord.added) + (lastModifiedWord.count - 1) > originalLength1) {
-			additional.push(new SequenceDiff(lastModifiedWord.s1Range, lastModifiedWord.s2Range));
-		}
-
-		lastModifiedWord = undefined;
-	}
-
-	for (const s of sequenceDiffs) {
-		function processWord(s1Range: OffsetRange, s2Range: OffsetRange) {
-			if (!lastModifiedWord || !lastModifiedWord.s1Range.containsRange(s1Range) || !lastModifiedWord.s2Range.containsRange(s2Range)) {
-				if (lastModifiedWord && !(lastModifiedWord.s1Range.endExclusive < s1Range.start && lastModifiedWord.s2Range.endExclusive < s2Range.start)) {
-					const s1Added = OffsetRange.tryCreate(lastModifiedWord.s1Range.endExclusive, s1Range.start);
-					const s2Added = OffsetRange.tryCreate(lastModifiedWord.s2Range.endExclusive, s2Range.start);
-					lastModifiedWord.deleted += s1Added?.length ?? 0;
-					lastModifiedWord.added += s2Added?.length ?? 0;
-
-					lastModifiedWord.s1Range = lastModifiedWord.s1Range.join(s1Range);
-					lastModifiedWord.s2Range = lastModifiedWord.s2Range.join(s2Range);
-				} else {
-					maybePushWordToAdditional();
-					lastModifiedWord = { added: 0, deleted: 0, count: 0, s1Range: s1Range, s2Range: s2Range };
-				}
-			}
-
-			const changedS1 = s1Range.intersect(s.seq1Range);
-			const changedS2 = s2Range.intersect(s.seq2Range);
-			lastModifiedWord.count++;
-			lastModifiedWord.deleted += changedS1?.length ?? 0;
-			lastModifiedWord.added += changedS2?.length ?? 0;
-		}
-
-		const w1Before = sequence1.findWordContaining(s.seq1Range.start - 1);
-		const w2Before = sequence2.findWordContaining(s.seq2Range.start - 1);
-
-		const w1After = sequence1.findWordContaining(s.seq1Range.endExclusive);
-		const w2After = sequence2.findWordContaining(s.seq2Range.endExclusive);
-
-		if (w1Before && w1After && w2Before && w2After && w1Before.equals(w1After) && w2Before.equals(w2After)) {
-			processWord(w1Before, w2Before);
-		} else {
-			if (w1Before && w2Before) {
-				processWord(w1Before, w2Before);
-			}
-			if (w1After && w2After) {
-				processWord(w1After, w2After);
-			}
-		}
-	}
-
-	maybePushWordToAdditional();
-
-	const merged = mergeSequenceDiffs(sequenceDiffs, additional);
-	return merged;
-}
-
-function mergeSequenceDiffs(sequenceDiffs1: SequenceDiff[], sequenceDiffs2: SequenceDiff[]): SequenceDiff[] {
-	const result: SequenceDiff[] = [];
-
-	while (sequenceDiffs1.length > 0 || sequenceDiffs2.length > 0) {
-		const sd1 = sequenceDiffs1[0];
-		const sd2 = sequenceDiffs2[0];
-
-		let next: SequenceDiff;
-		if (sd1 && (!sd2 || sd1.seq1Range.start < sd2.seq1Range.start)) {
-			next = sequenceDiffs1.shift()!;
-		} else {
-			next = sequenceDiffs2.shift()!;
-		}
-
-		if (result.length > 0 && result[result.length - 1].seq1Range.endExclusive >= next.seq1Range.start) {
-			result[result.length - 1] = result[result.length - 1].join(next);
-		} else {
-			result.push(next);
-		}
-	}
-
-	return result;
-}
-
-export function lineRangeMappingFromRangeMappings(alignments: RangeMapping[], originalLines: string[], modifiedLines: string[], dontAssertStartLine: boolean = false): DetailedLineRangeMapping[] {
-	const changes: DetailedLineRangeMapping[] = [];
-	for (const g of groupAdjacentBy(
-		alignments.map(a => getLineRangeMapping(a, originalLines, modifiedLines)),
-		(a1, a2) =>
-			a1.original.overlapOrTouch(a2.original)
-			|| a1.modified.overlapOrTouch(a2.modified)
-	)) {
-		const first = g[0];
-		const last = g[g.length - 1];
-
-		changes.push(new DetailedLineRangeMapping(
-			first.original.join(last.original),
-			first.modified.join(last.modified),
-			g.map(a => a.innerChanges![0]),
-		));
-	}
-
-	assertFn(() => {
-		if (!dontAssertStartLine) {
-			if (changes.length > 0 && changes[0].original.startLineNumber !== changes[0].modified.startLineNumber) {
-				return false;
-			}
-		}
-		return checkAdjacentItems(changes,
-			(m1, m2) => m2.original.startLineNumber - m1.original.endLineNumberExclusive === m2.modified.startLineNumber - m1.modified.endLineNumberExclusive &&
-				// There has to be an unchanged line in between (otherwise both diffs should have been joined)
-				m1.original.endLineNumberExclusive < m2.original.startLineNumber &&
-				m1.modified.endLineNumberExclusive < m2.modified.startLineNumber,
-		);
-	});
-
-	return changes;
-}
-
-export function getLineRangeMapping(rangeMapping: RangeMapping, originalLines: string[], modifiedLines: string[]): DetailedLineRangeMapping {
-	let lineStartDelta = 0;
-	let lineEndDelta = 0;
-
-	// rangeMapping describes the edit that replaces `rangeMapping.originalRange` with `newText := getText(modifiedLines, rangeMapping.modifiedRange)`.
-
-	// original: ]xxx \n <- this line is not modified
-	// modified: ]xx  \n
-	if (rangeMapping.modifiedRange.endColumn === 1 && rangeMapping.originalRange.endColumn === 1
-		&& rangeMapping.originalRange.startLineNumber + lineStartDelta <= rangeMapping.originalRange.endLineNumber
-		&& rangeMapping.modifiedRange.startLineNumber + lineStartDelta <= rangeMapping.modifiedRange.endLineNumber) {
-		// We can only do this if the range is not empty yet
-		lineEndDelta = -1;
-	}
-
-	// original: xxx[ \n <- this line is not modified
-	// modified: xxx[ \n
-	if (rangeMapping.modifiedRange.startColumn - 1 >= modifiedLines[rangeMapping.modifiedRange.startLineNumber - 1].length
-		&& rangeMapping.originalRange.startColumn - 1 >= originalLines[rangeMapping.originalRange.startLineNumber - 1].length
-		&& rangeMapping.originalRange.startLineNumber <= rangeMapping.originalRange.endLineNumber + lineEndDelta
-		&& rangeMapping.modifiedRange.startLineNumber <= rangeMapping.modifiedRange.endLineNumber + lineEndDelta) {
-		// We can only do this if the range is not empty yet
-		lineStartDelta = 1;
-	}
-
-	const originalLineRange = new LineRange(
-		rangeMapping.originalRange.startLineNumber + lineStartDelta,
-		rangeMapping.originalRange.endLineNumber + 1 + lineEndDelta
-	);
-	const modifiedLineRange = new LineRange(
-		rangeMapping.modifiedRange.startLineNumber + lineStartDelta,
-		rangeMapping.modifiedRange.endLineNumber + 1 + lineEndDelta
-	);
-
-	return new DetailedLineRangeMapping(originalLineRange, modifiedLineRange, [rangeMapping]);
-}
-
-export class LineSequence implements ISequence {
-	constructor(
-		private readonly trimmedHash: number[],
-		private readonly lines: string[]
-	) { }
-
-	getElement(offset: number): number {
-		return this.trimmedHash[offset];
-	}
-
-	get length(): number {
-		return this.trimmedHash.length;
-	}
-
-	getBoundaryScore(length: number): number {
-		const indentationBefore = length === 0 ? 0 : getIndentation(this.lines[length - 1]);
-		const indentationAfter = length === this.lines.length ? 0 : getIndentation(this.lines[length]);
-		return 1000 - (indentationBefore + indentationAfter);
-	}
-
-	getText(range: OffsetRange): string {
-		return this.lines.slice(range.start, range.endExclusive).join('\n');
-	}
-
-	isStronglyEqual(offset1: number, offset2: number): boolean {
-		return this.lines[offset1] === this.lines[offset2];
-	}
-}
-
-function getIndentation(str: string): number {
-	let i = 0;
-	while (i < str.length && (str.charCodeAt(i) === CharCode.Space || str.charCodeAt(i) === CharCode.Tab)) {
-		i++;
-	}
-	return i;
-}
-
-export class LinesSliceCharSequence implements ISequence {
-	private readonly elements: number[] = [];
-	private readonly firstCharOffsetByLine: number[] = [];
-	public readonly lineRange: OffsetRange;
-	// To account for trimming
-	private readonly additionalOffsetByLine: number[] = [];
-
-	constructor(public readonly lines: string[], lineRange: OffsetRange, public readonly considerWhitespaceChanges: boolean) {
-		// This slice has to have lineRange.length many \n! (otherwise diffing against an empty slice will be problematic)
-		// (Unless it covers the entire document, in that case the other slice also has to cover the entire document ands it's okay)
-
-		// If the slice covers the end, but does not start at the beginning, we include just the \n of the previous line.
-		let trimFirstLineFully = false;
-		if (lineRange.start > 0 && lineRange.endExclusive >= lines.length) {
-			lineRange = new OffsetRange(lineRange.start - 1, lineRange.endExclusive);
-			trimFirstLineFully = true;
-		}
-
-		this.lineRange = lineRange;
-
-		this.firstCharOffsetByLine[0] = 0;
-		for (let i = this.lineRange.start; i < this.lineRange.endExclusive; i++) {
-			let line = lines[i];
-			let offset = 0;
-			if (trimFirstLineFully) {
-				offset = line.length;
-				line = '';
-				trimFirstLineFully = false;
-			} else if (!considerWhitespaceChanges) {
-				const trimmedStartLine = line.trimStart();
-				offset = line.length - trimmedStartLine.length;
-				line = trimmedStartLine.trimEnd();
-			}
-
-			this.additionalOffsetByLine.push(offset);
-
-			for (let i = 0; i < line.length; i++) {
-				this.elements.push(line.charCodeAt(i));
-			}
-
-			// Don't add an \n that does not exist in the document.
-			if (i < lines.length - 1) {
-				this.elements.push('\n'.charCodeAt(0));
-				this.firstCharOffsetByLine[i - this.lineRange.start + 1] = this.elements.length;
-			}
-		}
-		// To account for the last line
-		this.additionalOffsetByLine.push(0);
-	}
-
-	toString() {
-		return `Slice: "${this.text}"`;
-	}
-
-	get text(): string {
-		return this.getText(new OffsetRange(0, this.length));
-	}
-
-	getText(range: OffsetRange): string {
-		return this.elements.slice(range.start, range.endExclusive).map(e => String.fromCharCode(e)).join('');
-	}
-
-	getElement(offset: number): number {
-		return this.elements[offset];
-	}
-
-	get length(): number {
-		return this.elements.length;
-	}
-
-	public getBoundaryScore(length: number): number {
-		//   a   b   c   ,           d   e   f
-		// 11  0   0   12  15  6   13  0   0   11
-
-		const prevCategory = getCategory(length > 0 ? this.elements[length - 1] : -1);
-		const nextCategory = getCategory(length < this.elements.length ? this.elements[length] : -1);
-
-		if (prevCategory === CharBoundaryCategory.LineBreakCR && nextCategory === CharBoundaryCategory.LineBreakLF) {
-			// don't break between \r and \n
-			return 0;
-		}
-
-		let score = 0;
-		if (prevCategory !== nextCategory) {
-			score += 10;
-			if (nextCategory === CharBoundaryCategory.WordUpper) {
-				score += 1;
-			}
-		}
-
-		score += getCategoryBoundaryScore(prevCategory);
-		score += getCategoryBoundaryScore(nextCategory);
-
-		return score;
-	}
-
-	public translateOffset(offset: number): Position {
-		// find smallest i, so that lineBreakOffsets[i] <= offset using binary search
-		if (this.lineRange.isEmpty) {
-			return new Position(this.lineRange.start + 1, 1);
-		}
-
-		const i = findLastIdxMonotonous(this.firstCharOffsetByLine, (value) => value <= offset);
-		return new Position(this.lineRange.start + i + 1, offset - this.firstCharOffsetByLine[i] + this.additionalOffsetByLine[i] + 1);
-	}
-
-	public translateRange(range: OffsetRange): Range {
-		return Range.fromPositions(this.translateOffset(range.start), this.translateOffset(range.endExclusive));
-	}
-
-	/**
-	 * Finds the word that contains the character at the given offset
-	 */
-	public findWordContaining(offset: number): OffsetRange | undefined {
-		if (offset < 0 || offset >= this.elements.length) {
-			return undefined;
-		}
-
-		if (!isWordChar(this.elements[offset])) {
-			return undefined;
-		}
-
-		// find start
-		let start = offset;
-		while (start > 0 && isWordChar(this.elements[start - 1])) {
-			start--;
-		}
-
-		// find end
-		let end = offset;
-		while (end < this.elements.length && isWordChar(this.elements[end])) {
-			end++;
-		}
-
-		return new OffsetRange(start, end);
-	}
-
-	public countLinesIn(range: OffsetRange): number {
-		return this.translateOffset(range.endExclusive).lineNumber - this.translateOffset(range.start).lineNumber;
-	}
-
-	public isStronglyEqual(offset1: number, offset2: number): boolean {
-		return this.elements[offset1] === this.elements[offset2];
-	}
-
-	public extendToFullLines(range: OffsetRange): OffsetRange {
-		const start = findLastMonotonous(this.firstCharOffsetByLine, x => x <= range.start) ?? 0;
-		const end = findFirstMonotonous(this.firstCharOffsetByLine, x => range.endExclusive <= x) ?? this.elements.length;
-		return new OffsetRange(start, end);
-	}
-}
-
-function isWordChar(charCode: number): boolean {
-	return charCode >= CharCode.a && charCode <= CharCode.z
-		|| charCode >= CharCode.A && charCode <= CharCode.Z
-		|| charCode >= CharCode.Digit0 && charCode <= CharCode.Digit9;
-}
-
-const enum CharBoundaryCategory {
-	WordLower,
-	WordUpper,
-	WordNumber,
-	End,
-	Other,
-	Space,
-	LineBreakCR,
-	LineBreakLF,
-}
-
-const score: Record<CharBoundaryCategory, number> = {
-	[CharBoundaryCategory.WordLower]: 0,
-	[CharBoundaryCategory.WordUpper]: 0,
-	[CharBoundaryCategory.WordNumber]: 0,
-	[CharBoundaryCategory.End]: 10,
-	[CharBoundaryCategory.Other]: 2,
-	[CharBoundaryCategory.Space]: 3,
-	[CharBoundaryCategory.LineBreakCR]: 10,
-	[CharBoundaryCategory.LineBreakLF]: 10,
-};
-
-function getCategoryBoundaryScore(category: CharBoundaryCategory): number {
-	return score[category];
-}
-
-function getCategory(charCode: number): CharBoundaryCategory {
-	if (charCode === CharCode.LineFeed) {
-		return CharBoundaryCategory.LineBreakLF;
-	} else if (charCode === CharCode.CarriageReturn) {
-		return CharBoundaryCategory.LineBreakCR;
-	} else if (isSpace(charCode)) {
-		return CharBoundaryCategory.Space;
-	} else if (charCode >= CharCode.a && charCode <= CharCode.z) {
-		return CharBoundaryCategory.WordLower;
-	} else if (charCode >= CharCode.A && charCode <= CharCode.Z) {
-		return CharBoundaryCategory.WordUpper;
-	} else if (charCode >= CharCode.Digit0 && charCode <= CharCode.Digit9) {
-		return CharBoundaryCategory.WordNumber;
-	} else if (charCode === -1) {
-		return CharBoundaryCategory.End;
-	} else {
-		return CharBoundaryCategory.Other;
-	}
-}
-
-function isSpace(charCode: number): boolean {
-	return charCode === CharCode.Space || charCode === CharCode.Tab;
-}
-
-const chrKeys = new Map<string, number>();
-function getKey(chr: string): number {
-	let key = chrKeys.get(chr);
-	if (key === undefined) {
-		key = chrKeys.size;
-		chrKeys.set(chr, key);
-	}
-	return key;
-}
-
-class LineRangeFragment {
-	private readonly totalCount: number;
-	private readonly histogram: number[] = [];
-	constructor(
-		public readonly range: LineRange,
-		public readonly lines: string[],
-		public readonly source: DetailedLineRangeMapping,
-	) {
-		let counter = 0;
-		for (let i = range.startLineNumber - 1; i < range.endLineNumberExclusive - 1; i++) {
-			const line = lines[i];
-			for (let j = 0; j < line.length; j++) {
-				counter++;
-				const chr = line[j];
-				const key = getKey(chr);
-				this.histogram[key] = (this.histogram[key] || 0) + 1;
-			}
-			counter++;
-			const key = getKey('\n');
-			this.histogram[key] = (this.histogram[key] || 0) + 1;
-		}
-
-		this.totalCount = counter;
-	}
-
-	public computeSimilarity(other: LineRangeFragment): number {
-		let sumDifferences = 0;
-		const maxLength = Math.max(this.histogram.length, other.histogram.length);
-		for (let i = 0; i < maxLength; i++) {
-			sumDifferences += Math.abs((this.histogram[i] ?? 0) - (other.histogram[i] ?? 0));
-		}
-		return 1 - (sumDifferences / (this.totalCount + other.totalCount));
-	}
-}
diff --git a/src/vs/editor/common/diff/algorithms/utils.ts b/src/vs/editor/common/diff/algorithms/utils.ts
deleted file mode 100644
index e959afb86de..00000000000
--- a/src/vs/editor/common/diff/algorithms/utils.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-export class Array2D<T> {
-	private readonly array: T[] = [];
-
-	constructor(public readonly width: number, public readonly height: number) {
-		this.array = new Array<T>(width * height);
-	}
-
-	get(x: number, y: number): T {
-		return this.array[x + y * this.width];
-	}
-
-	set(x: number, y: number, value: T): void {
-		this.array[x + y * this.width] = value;
-	}
-}
diff --git a/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.ts
similarity index 99%
rename from src/vs/editor/common/diff/algorithms/diffAlgorithm.ts
rename to src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.ts
index c38a84c2845..2d095c6209b 100644
--- a/src/vs/editor/common/diff/algorithms/diffAlgorithm.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.ts
@@ -56,7 +56,7 @@ export class SequenceDiff {
 		public readonly seq2Range: OffsetRange,
 	) { }
 
-	public reverse(): SequenceDiff {
+	public swap(): SequenceDiff {
 		return new SequenceDiff(this.seq2Range, this.seq1Range);
 	}
 
diff --git a/src/vs/editor/common/diff/algorithms/dynamicProgrammingDiffing.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing.ts
similarity index 95%
rename from src/vs/editor/common/diff/algorithms/dynamicProgrammingDiffing.ts
rename to src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing.ts
index 2212ebef27e..f27644435b0 100644
--- a/src/vs/editor/common/diff/algorithms/dynamicProgrammingDiffing.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { IDiffAlgorithm, SequenceDiff, ISequence, ITimeout, InfiniteTimeout, DiffAlgorithmResult } from 'vs/editor/common/diff/algorithms/diffAlgorithm';
-import { Array2D } from 'vs/editor/common/diff/algorithms/utils';
+import { IDiffAlgorithm, SequenceDiff, ISequence, ITimeout, InfiniteTimeout, DiffAlgorithmResult } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
+import { Array2D } from 'vs/editor/common/diff/defaultLinesDiffComputer/utils';
 
 /**
  * A O(MN) diffing algorithm that supports a score function.
diff --git a/src/vs/editor/common/diff/algorithms/myersDiffAlgorithm.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts
similarity index 97%
rename from src/vs/editor/common/diff/algorithms/myersDiffAlgorithm.ts
rename to src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts
index 049c5ff157c..0f3b64004cd 100644
--- a/src/vs/editor/common/diff/algorithms/myersDiffAlgorithm.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { DiffAlgorithmResult, IDiffAlgorithm, ISequence, ITimeout, InfiniteTimeout, SequenceDiff } from 'vs/editor/common/diff/algorithms/diffAlgorithm';
+import { DiffAlgorithmResult, IDiffAlgorithm, ISequence, ITimeout, InfiniteTimeout, SequenceDiff } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
 
 /**
  * An O(ND) diff algorithm that has a quadratic space worst-case complexity.
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMoves.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMoves.ts
new file mode 100644
index 00000000000..a148f75de3e
--- /dev/null
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMoves.ts
@@ -0,0 +1,314 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ITimeout, SequenceDiff } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
+import { DetailedLineRangeMapping, LineRangeMapping } from '../rangeMapping';
+import { pushMany, compareBy, numberComparator, reverseOrder } from 'vs/base/common/arrays';
+import { MonotonousArray, findLastMonotonous } from 'vs/base/common/arraysFind';
+import { SetMap } from 'vs/base/common/collections';
+import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
+import { OffsetRange } from 'vs/editor/common/core/offsetRange';
+import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
+import { LineRangeFragment, isSpace } from 'vs/editor/common/diff/defaultLinesDiffComputer/utils';
+import { MyersDiffAlgorithm } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm';
+
+export function computeMoves(
+	changes: DetailedLineRangeMapping[],
+	originalLines: string[],
+	modifiedLines: string[],
+	hashedOriginalLines: number[],
+	hashedModifiedLines: number[],
+	timeout: ITimeout
+): LineRangeMapping[] {
+	let { moves, excludedChanges } = computeMovesFromSimpleDeletionsToSimpleInsertions(changes, originalLines, modifiedLines, timeout);
+
+	if (!timeout.isValid()) { return []; }
+
+	const filteredChanges = changes.filter(c => !excludedChanges.has(c));
+	const unchangedMoves = computeUnchangedMoves(filteredChanges, hashedOriginalLines, hashedModifiedLines, originalLines, modifiedLines, timeout);
+	pushMany(moves, unchangedMoves);
+
+	moves = joinCloseConsecutiveMoves(moves);
+	// Ignore too short moves
+	moves = moves.filter(current => {
+		const originalText = current.original.toOffsetRange().slice(originalLines).map(l => l.trim()).join('\n');
+		return originalText.length >= 10;
+	});
+	moves = removeMovesInSameDiff(changes, moves);
+
+	return moves;
+}
+
+function computeMovesFromSimpleDeletionsToSimpleInsertions(
+	changes: DetailedLineRangeMapping[],
+	originalLines: string[],
+	modifiedLines: string[],
+	timeout: ITimeout,
+) {
+	const moves: LineRangeMapping[] = [];
+
+	const deletions = changes
+		.filter(c => c.modified.isEmpty && c.original.length >= 3)
+		.map(d => new LineRangeFragment(d.original, originalLines, d));
+	const insertions = new Set(changes
+		.filter(c => c.original.isEmpty && c.modified.length >= 3)
+		.map(d => new LineRangeFragment(d.modified, modifiedLines, d)));
+
+	const excludedChanges = new Set<DetailedLineRangeMapping>();
+
+	for (const deletion of deletions) {
+		let highestSimilarity = -1;
+		let best: LineRangeFragment | undefined;
+		for (const insertion of insertions) {
+			const similarity = deletion.computeSimilarity(insertion);
+			if (similarity > highestSimilarity) {
+				highestSimilarity = similarity;
+				best = insertion;
+			}
+		}
+
+		if (highestSimilarity > 0.90 && best) {
+			insertions.delete(best);
+			moves.push(new LineRangeMapping(deletion.range, best.range));
+			excludedChanges.add(deletion.source);
+			excludedChanges.add(best.source);
+		}
+
+		if (!timeout.isValid()) {
+			return { moves, excludedChanges };
+		}
+	}
+
+	return { moves, excludedChanges };
+}
+
+function computeUnchangedMoves(
+	changes: DetailedLineRangeMapping[],
+	hashedOriginalLines: number[],
+	hashedModifiedLines: number[],
+	originalLines: string[],
+	modifiedLines: string[],
+	timeout: ITimeout,
+) {
+	const moves: LineRangeMapping[] = [];
+
+	const original3LineHashes = new SetMap<string, { range: LineRange }>();
+
+	for (const change of changes) {
+		for (let i = change.original.startLineNumber; i < change.original.endLineNumberExclusive - 2; i++) {
+			const key = `${hashedOriginalLines[i - 1]}:${hashedOriginalLines[i + 1 - 1]}:${hashedOriginalLines[i + 2 - 1]}`;
+			original3LineHashes.add(key, { range: new LineRange(i, i + 3) });
+		}
+	}
+
+	interface PossibleMapping {
+		modifiedLineRange: LineRange;
+		originalLineRange: LineRange;
+	}
+
+	const possibleMappings: PossibleMapping[] = [];
+
+	changes.sort(compareBy(c => c.modified.startLineNumber, numberComparator));
+
+	for (const change of changes) {
+		let lastMappings: PossibleMapping[] = [];
+		for (let i = change.modified.startLineNumber; i < change.modified.endLineNumberExclusive - 2; i++) {
+			const key = `${hashedModifiedLines[i - 1]}:${hashedModifiedLines[i + 1 - 1]}:${hashedModifiedLines[i + 2 - 1]}`;
+			const currentModifiedRange = new LineRange(i, i + 3);
+
+			const nextMappings: PossibleMapping[] = [];
+			original3LineHashes.forEach(key, ({ range }) => {
+				for (const lastMapping of lastMappings) {
+					// does this match extend some last match?
+					if (lastMapping.originalLineRange.endLineNumberExclusive + 1 === range.endLineNumberExclusive &&
+						lastMapping.modifiedLineRange.endLineNumberExclusive + 1 === currentModifiedRange.endLineNumberExclusive) {
+						lastMapping.originalLineRange = new LineRange(lastMapping.originalLineRange.startLineNumber, range.endLineNumberExclusive);
+						lastMapping.modifiedLineRange = new LineRange(lastMapping.modifiedLineRange.startLineNumber, currentModifiedRange.endLineNumberExclusive);
+						nextMappings.push(lastMapping);
+						return;
+					}
+				}
+
+				const mapping: PossibleMapping = {
+					modifiedLineRange: currentModifiedRange,
+					originalLineRange: range,
+				};
+				possibleMappings.push(mapping);
+				nextMappings.push(mapping);
+			});
+			lastMappings = nextMappings;
+		}
+
+		if (!timeout.isValid()) {
+			return [];
+		}
+	}
+
+	possibleMappings.sort(reverseOrder(compareBy(m => m.modifiedLineRange.length, numberComparator)));
+
+	const modifiedSet = new LineRangeSet();
+	const originalSet = new LineRangeSet();
+
+	for (const mapping of possibleMappings) {
+
+		const diffOrigToMod = mapping.modifiedLineRange.startLineNumber - mapping.originalLineRange.startLineNumber;
+		const modifiedSections = modifiedSet.subtractFrom(mapping.modifiedLineRange);
+		const originalTranslatedSections = originalSet.subtractFrom(mapping.originalLineRange).getWithDelta(diffOrigToMod);
+
+		const modifiedIntersectedSections = modifiedSections.getIntersection(originalTranslatedSections);
+
+		for (const s of modifiedIntersectedSections.ranges) {
+			if (s.length < 3) {
+				continue;
+			}
+			const modifiedLineRange = s;
+			const originalLineRange = s.delta(-diffOrigToMod);
+
+			moves.push(new LineRangeMapping(originalLineRange, modifiedLineRange));
+
+			modifiedSet.addRange(modifiedLineRange);
+			originalSet.addRange(originalLineRange);
+		}
+	}
+
+	moves.sort(compareBy(m => m.original.startLineNumber, numberComparator));
+
+	const monotonousChanges = new MonotonousArray(changes);
+	for (let i = 0; i < moves.length; i++) {
+		const move = moves[i];
+		const firstTouchingChangeOrig = monotonousChanges.findLastMonotonous(c => c.original.startLineNumber <= move.original.startLineNumber)!;
+		const firstTouchingChangeMod = findLastMonotonous(changes, c => c.modified.startLineNumber <= move.modified.startLineNumber)!;
+		const linesAbove = Math.max(
+			move.original.startLineNumber - firstTouchingChangeOrig.original.startLineNumber,
+			move.modified.startLineNumber - firstTouchingChangeMod.modified.startLineNumber
+		);
+
+		const lastTouchingChangeOrig = monotonousChanges.findLastMonotonous(c => c.original.startLineNumber < move.original.endLineNumberExclusive)!;
+		const lastTouchingChangeMod = findLastMonotonous(changes, c => c.modified.startLineNumber < move.modified.endLineNumberExclusive)!;
+		const linesBelow = Math.max(
+			lastTouchingChangeOrig.original.endLineNumberExclusive - move.original.endLineNumberExclusive,
+			lastTouchingChangeMod.modified.endLineNumberExclusive - move.modified.endLineNumberExclusive
+		);
+
+		let extendToTop: number;
+		for (extendToTop = 0; extendToTop < linesAbove; extendToTop++) {
+			const origLine = move.original.startLineNumber - extendToTop - 1;
+			const modLine = move.modified.startLineNumber - extendToTop - 1;
+			if (modifiedSet.contains(modLine) || originalSet.contains(origLine)) {
+				break;
+			}
+			if (!areLinesSimilar(originalLines[origLine - 1], modifiedLines[modLine - 1], timeout)) {
+				break;
+			}
+		}
+
+		if (extendToTop > 0) {
+			originalSet.addRange(new LineRange(move.original.startLineNumber - extendToTop, move.original.startLineNumber));
+			modifiedSet.addRange(new LineRange(move.modified.startLineNumber - extendToTop, move.modified.startLineNumber));
+		}
+
+		let extendToBottom: number;
+		for (extendToBottom = 0; extendToBottom < linesBelow; extendToBottom++) {
+			const origLine = move.original.endLineNumberExclusive + extendToBottom;
+			const modLine = move.modified.endLineNumberExclusive + extendToBottom;
+			if (modifiedSet.contains(modLine) || originalSet.contains(origLine)) {
+				break;
+			}
+			if (!areLinesSimilar(originalLines[origLine - 1], modifiedLines[modLine - 1], timeout)) {
+				break;
+			}
+		}
+
+		if (extendToBottom > 0) {
+			originalSet.addRange(new LineRange(move.original.endLineNumberExclusive, move.original.endLineNumberExclusive + extendToBottom));
+			modifiedSet.addRange(new LineRange(move.modified.endLineNumberExclusive, move.modified.endLineNumberExclusive + extendToBottom));
+		}
+
+		if (extendToTop > 0 || extendToBottom > 0) {
+			moves[i] = new LineRangeMapping(
+				new LineRange(move.original.startLineNumber - extendToTop, move.original.endLineNumberExclusive + extendToBottom),
+				new LineRange(move.modified.startLineNumber - extendToTop, move.modified.endLineNumberExclusive + extendToBottom),
+			);
+		}
+	}
+
+	return moves;
+}
+
+function areLinesSimilar(line1: string, line2: string, timeout: ITimeout): boolean {
+	if (line1.trim() === line2.trim()) { return true; }
+	if (line1.length > 300 && line2.length > 300) { return false; }
+
+	const myersDiffingAlgorithm = new MyersDiffAlgorithm();
+	const result = myersDiffingAlgorithm.compute(
+		new LinesSliceCharSequence([line1], new OffsetRange(0, 1), false),
+		new LinesSliceCharSequence([line2], new OffsetRange(0, 1), false),
+		timeout
+	);
+	let commonNonSpaceCharCount = 0;
+	const inverted = SequenceDiff.invert(result.diffs, line1.length);
+	for (const seq of inverted) {
+		seq.seq1Range.forEach(idx => {
+			if (!isSpace(line1.charCodeAt(idx))) {
+				commonNonSpaceCharCount++;
+			}
+		});
+	}
+
+	function countNonWsChars(str: string): number {
+		let count = 0;
+		for (let i = 0; i < line1.length; i++) {
+			if (!isSpace(str.charCodeAt(i))) {
+				count++;
+			}
+		}
+		return count;
+	}
+
+	const longerLineLength = countNonWsChars(line1.length > line2.length ? line1 : line2);
+	const r = commonNonSpaceCharCount / longerLineLength > 0.6 && longerLineLength > 10;
+	return r;
+}
+
+function joinCloseConsecutiveMoves(moves: LineRangeMapping[]): LineRangeMapping[] {
+	if (moves.length === 0) {
+		return moves;
+	}
+
+	moves.sort(compareBy(m => m.original.startLineNumber, numberComparator));
+
+	const result = [moves[0]];
+	for (let i = 1; i < moves.length; i++) {
+		const last = result[result.length - 1];
+		const current = moves[i];
+
+		const originalDist = current.original.startLineNumber - last.original.endLineNumberExclusive;
+		const modifiedDist = current.modified.startLineNumber - last.modified.endLineNumberExclusive;
+		const currentMoveAfterLast = originalDist >= 0 && modifiedDist >= 0;
+
+		if (currentMoveAfterLast && originalDist + modifiedDist <= 2) {
+			result[result.length - 1] = last.join(current);
+			continue;
+		}
+
+		result.push(current);
+	}
+	return result;
+}
+
+function removeMovesInSameDiff(changes: DetailedLineRangeMapping[], moves: LineRangeMapping[]) {
+	const changesMonotonous = new MonotonousArray(changes);
+	moves = moves.filter(m => {
+		const diffBeforeOriginalMove = changesMonotonous.findLastMonotonous(c => c.original.endLineNumberExclusive <= m.original.startLineNumber)
+			|| new LineRangeMapping(new LineRange(1, 1), new LineRange(1, 1));
+
+		const modifiedDistToPrevDiff = m.modified.startLineNumber - diffBeforeOriginalMove.modified.endLineNumberExclusive;
+		const originalDistToPrevDiff = m.original.startLineNumber - diffBeforeOriginalMove.original.endLineNumberExclusive;
+
+		const differentDistances = modifiedDistToPrevDiff !== originalDistToPrevDiff;
+		return differentDistances;
+	});
+	return moves;
+}
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
new file mode 100644
index 00000000000..c94f8cea008
--- /dev/null
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
@@ -0,0 +1,310 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { equals, groupAdjacentBy } from 'vs/base/common/arrays';
+import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
+import { LineRange } from 'vs/editor/common/core/lineRange';
+import { OffsetRange } from 'vs/editor/common/core/offsetRange';
+import { Position } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
+import { DateTimeout, ITimeout, InfiniteTimeout, SequenceDiff } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
+import { DynamicProgrammingDiffing } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing';
+import { MyersDiffAlgorithm } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm';
+import { computeMoves } from 'vs/editor/common/diff/defaultLinesDiffComputer/computeMoves';
+import { extendDiffsToEntireWordIfAppropriate, optimizeSequenceDiffs, removeRandomLineMatches, removeRandomMatches, smoothenSequenceDiffs } from 'vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations';
+import { ILinesDiffComputer, ILinesDiffComputerOptions, LinesDiff, MovedText } from 'vs/editor/common/diff/linesDiffComputer';
+import { DetailedLineRangeMapping, RangeMapping } from '../rangeMapping';
+import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
+import { LineSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/lineSequence';
+
+export class DefaultLinesDiffComputer implements ILinesDiffComputer {
+	private readonly dynamicProgrammingDiffing = new DynamicProgrammingDiffing();
+	private readonly myersDiffingAlgorithm = new MyersDiffAlgorithm();
+
+	computeDiff(originalLines: string[], modifiedLines: string[], options: ILinesDiffComputerOptions): LinesDiff {
+		if (originalLines.length <= 1 && equals(originalLines, modifiedLines, (a, b) => a === b)) {
+			return new LinesDiff([], [], false);
+		}
+
+		if (originalLines.length === 1 && originalLines[0].length === 0 || modifiedLines.length === 1 && modifiedLines[0].length === 0) {
+			return new LinesDiff([
+				new DetailedLineRangeMapping(
+					new LineRange(1, originalLines.length + 1),
+					new LineRange(1, modifiedLines.length + 1),
+					[
+						new RangeMapping(
+							new Range(1, 1, originalLines.length, originalLines[0].length + 1),
+							new Range(1, 1, modifiedLines.length, modifiedLines[0].length + 1)
+						)
+					]
+				)
+			], [], false);
+		}
+
+		const timeout = options.maxComputationTimeMs === 0 ? InfiniteTimeout.instance : new DateTimeout(options.maxComputationTimeMs);
+		const considerWhitespaceChanges = !options.ignoreTrimWhitespace;
+
+		const perfectHashes = new Map<string, number>();
+		function getOrCreateHash(text: string): number {
+			let hash = perfectHashes.get(text);
+			if (hash === undefined) {
+				hash = perfectHashes.size;
+				perfectHashes.set(text, hash);
+			}
+			return hash;
+		}
+
+		const originalLinesHashes = originalLines.map((l) => getOrCreateHash(l.trim()));
+		const modifiedLinesHashes = modifiedLines.map((l) => getOrCreateHash(l.trim()));
+
+		const sequence1 = new LineSequence(originalLinesHashes, originalLines);
+		const sequence2 = new LineSequence(modifiedLinesHashes, modifiedLines);
+
+		const lineAlignmentResult = (() => {
+			if (sequence1.length + sequence2.length < 1700) {
+				// Use the improved algorithm for small files
+				return this.dynamicProgrammingDiffing.compute(
+					sequence1,
+					sequence2,
+					timeout,
+					(offset1, offset2) =>
+						originalLines[offset1] === modifiedLines[offset2]
+							? modifiedLines[offset2].length === 0
+								? 0.1
+								: 1 + Math.log(1 + modifiedLines[offset2].length)
+							: 0.99
+				);
+			}
+
+			return this.myersDiffingAlgorithm.compute(
+				sequence1,
+				sequence2
+			);
+		})();
+
+		let lineAlignments = lineAlignmentResult.diffs;
+		let hitTimeout = lineAlignmentResult.hitTimeout;
+		lineAlignments = optimizeSequenceDiffs(sequence1, sequence2, lineAlignments);
+		lineAlignments = removeRandomLineMatches(sequence1, sequence2, lineAlignments);
+
+		const alignments: RangeMapping[] = [];
+
+		const scanForWhitespaceChanges = (equalLinesCount: number) => {
+			if (!considerWhitespaceChanges) {
+				return;
+			}
+
+			for (let i = 0; i < equalLinesCount; i++) {
+				const seq1Offset = seq1LastStart + i;
+				const seq2Offset = seq2LastStart + i;
+				if (originalLines[seq1Offset] !== modifiedLines[seq2Offset]) {
+					// This is because of whitespace changes, diff these lines
+					const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(
+						new OffsetRange(seq1Offset, seq1Offset + 1),
+						new OffsetRange(seq2Offset, seq2Offset + 1),
+					), timeout, considerWhitespaceChanges);
+					for (const a of characterDiffs.mappings) {
+						alignments.push(a);
+					}
+					if (characterDiffs.hitTimeout) {
+						hitTimeout = true;
+					}
+				}
+			}
+		};
+
+		let seq1LastStart = 0;
+		let seq2LastStart = 0;
+
+		for (const diff of lineAlignments) {
+			assertFn(() => diff.seq1Range.start - seq1LastStart === diff.seq2Range.start - seq2LastStart);
+
+			const equalLinesCount = diff.seq1Range.start - seq1LastStart;
+
+			scanForWhitespaceChanges(equalLinesCount);
+
+			seq1LastStart = diff.seq1Range.endExclusive;
+			seq2LastStart = diff.seq2Range.endExclusive;
+
+			const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges);
+			if (characterDiffs.hitTimeout) {
+				hitTimeout = true;
+			}
+			for (const a of characterDiffs.mappings) {
+				alignments.push(a);
+			}
+		}
+
+		scanForWhitespaceChanges(originalLines.length - seq1LastStart);
+
+		const changes = lineRangeMappingFromRangeMappings(alignments, originalLines, modifiedLines);
+
+		let moves: MovedText[] = [];
+		if (options.computeMoves) {
+			moves = this.computeMoves(changes, originalLines, modifiedLines, originalLinesHashes, modifiedLinesHashes, timeout, considerWhitespaceChanges);
+		}
+
+		// Make sure all ranges are valid
+		assertFn(() => {
+			function validatePosition(pos: Position, lines: string[]): boolean {
+				if (pos.lineNumber < 1 || pos.lineNumber > lines.length) { return false; }
+				const line = lines[pos.lineNumber - 1];
+				if (pos.column < 1 || pos.column > line.length + 1) { return false; }
+				return true;
+			}
+
+			function validateRange(range: LineRange, lines: string[]): boolean {
+				if (range.startLineNumber < 1 || range.startLineNumber > lines.length + 1) { return false; }
+				if (range.endLineNumberExclusive < 1 || range.endLineNumberExclusive > lines.length + 1) { return false; }
+				return true;
+			}
+
+			for (const c of changes) {
+				if (!c.innerChanges) { return false; }
+				for (const ic of c.innerChanges) {
+					const valid = validatePosition(ic.modifiedRange.getStartPosition(), modifiedLines) && validatePosition(ic.modifiedRange.getEndPosition(), modifiedLines) &&
+						validatePosition(ic.originalRange.getStartPosition(), originalLines) && validatePosition(ic.originalRange.getEndPosition(), originalLines);
+					if (!valid) { return false; }
+				}
+				if (!validateRange(c.modified, modifiedLines) || !validateRange(c.original, originalLines)) {
+					return false;
+				}
+			}
+			return true;
+		});
+
+		return new LinesDiff(changes, moves, hitTimeout);
+	}
+
+	private computeMoves(
+		changes: DetailedLineRangeMapping[],
+		originalLines: string[],
+		modifiedLines: string[],
+		hashedOriginalLines: number[],
+		hashedModifiedLines: number[],
+		timeout: ITimeout,
+		considerWhitespaceChanges: boolean,
+	): MovedText[] {
+		const moves = computeMoves(
+			changes,
+			originalLines,
+			modifiedLines,
+			hashedOriginalLines,
+			hashedModifiedLines,
+			timeout,
+		);
+		const movesWithDiffs = moves.map(m => {
+			const moveChanges = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(
+				m.original.toOffsetRange(),
+				m.modified.toOffsetRange(),
+			), timeout, considerWhitespaceChanges);
+			const mappings = lineRangeMappingFromRangeMappings(moveChanges.mappings, originalLines, modifiedLines, true);
+			return new MovedText(m, mappings);
+		});
+		return movesWithDiffs;
+	}
+
+	private refineDiff(originalLines: string[], modifiedLines: string[], diff: SequenceDiff, timeout: ITimeout, considerWhitespaceChanges: boolean): { mappings: RangeMapping[]; hitTimeout: boolean } {
+		const slice1 = new LinesSliceCharSequence(originalLines, diff.seq1Range, considerWhitespaceChanges);
+		const slice2 = new LinesSliceCharSequence(modifiedLines, diff.seq2Range, considerWhitespaceChanges);
+
+		const diffResult = slice1.length + slice2.length < 500
+			? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout)
+			: this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
+
+		let diffs = diffResult.diffs;
+		diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
+		diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs);
+		diffs = smoothenSequenceDiffs(slice1, slice2, diffs);
+		diffs = removeRandomMatches(slice1, slice2, diffs);
+
+		const result = diffs.map(
+			(d) =>
+				new RangeMapping(
+					slice1.translateRange(d.seq1Range),
+					slice2.translateRange(d.seq2Range)
+				)
+		);
+
+		// Assert: result applied on original should be the same as diff applied to original
+
+		return {
+			mappings: result,
+			hitTimeout: diffResult.hitTimeout,
+		};
+	}
+}
+
+export function lineRangeMappingFromRangeMappings(alignments: RangeMapping[], originalLines: string[], modifiedLines: string[], dontAssertStartLine: boolean = false): DetailedLineRangeMapping[] {
+	const changes: DetailedLineRangeMapping[] = [];
+	for (const g of groupAdjacentBy(
+		alignments.map(a => getLineRangeMapping(a, originalLines, modifiedLines)),
+		(a1, a2) =>
+			a1.original.overlapOrTouch(a2.original)
+			|| a1.modified.overlapOrTouch(a2.modified)
+	)) {
+		const first = g[0];
+		const last = g[g.length - 1];
+
+		changes.push(new DetailedLineRangeMapping(
+			first.original.join(last.original),
+			first.modified.join(last.modified),
+			g.map(a => a.innerChanges![0]),
+		));
+	}
+
+	assertFn(() => {
+		if (!dontAssertStartLine) {
+			if (changes.length > 0 && changes[0].original.startLineNumber !== changes[0].modified.startLineNumber) {
+				return false;
+			}
+		}
+		return checkAdjacentItems(changes,
+			(m1, m2) => m2.original.startLineNumber - m1.original.endLineNumberExclusive === m2.modified.startLineNumber - m1.modified.endLineNumberExclusive &&
+				// There has to be an unchanged line in between (otherwise both diffs should have been joined)
+				m1.original.endLineNumberExclusive < m2.original.startLineNumber &&
+				m1.modified.endLineNumberExclusive < m2.modified.startLineNumber,
+		);
+	});
+
+	return changes;
+}
+
+export function getLineRangeMapping(rangeMapping: RangeMapping, originalLines: string[], modifiedLines: string[]): DetailedLineRangeMapping {
+	let lineStartDelta = 0;
+	let lineEndDelta = 0;
+
+	// rangeMapping describes the edit that replaces `rangeMapping.originalRange` with `newText := getText(modifiedLines, rangeMapping.modifiedRange)`.
+
+	// original: ]xxx \n <- this line is not modified
+	// modified: ]xx  \n
+	if (rangeMapping.modifiedRange.endColumn === 1 && rangeMapping.originalRange.endColumn === 1
+		&& rangeMapping.originalRange.startLineNumber + lineStartDelta <= rangeMapping.originalRange.endLineNumber
+		&& rangeMapping.modifiedRange.startLineNumber + lineStartDelta <= rangeMapping.modifiedRange.endLineNumber) {
+		// We can only do this if the range is not empty yet
+		lineEndDelta = -1;
+	}
+
+	// original: xxx[ \n <- this line is not modified
+	// modified: xxx[ \n
+	if (rangeMapping.modifiedRange.startColumn - 1 >= modifiedLines[rangeMapping.modifiedRange.startLineNumber - 1].length
+		&& rangeMapping.originalRange.startColumn - 1 >= originalLines[rangeMapping.originalRange.startLineNumber - 1].length
+		&& rangeMapping.originalRange.startLineNumber <= rangeMapping.originalRange.endLineNumber + lineEndDelta
+		&& rangeMapping.modifiedRange.startLineNumber <= rangeMapping.modifiedRange.endLineNumber + lineEndDelta) {
+		// We can only do this if the range is not empty yet
+		lineStartDelta = 1;
+	}
+
+	const originalLineRange = new LineRange(
+		rangeMapping.originalRange.startLineNumber + lineStartDelta,
+		rangeMapping.originalRange.endLineNumber + 1 + lineEndDelta
+	);
+	const modifiedLineRange = new LineRange(
+		rangeMapping.modifiedRange.startLineNumber + lineStartDelta,
+		rangeMapping.modifiedRange.endLineNumber + 1 + lineEndDelta
+	);
+
+	return new DetailedLineRangeMapping(originalLineRange, modifiedLineRange, [rangeMapping]);
+}
diff --git a/src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
similarity index 72%
rename from src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts
rename to src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
index cef14d466c8..d39fc3c93e7 100644
--- a/src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
@@ -4,177 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
-import { ISequence, SequenceDiff } from 'vs/editor/common/diff/algorithms/diffAlgorithm';
-import { LineSequence, LinesSliceCharSequence } from 'vs/editor/common/diff/advancedLinesDiffComputer';
+import { ISequence, SequenceDiff } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
+import { LineSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/lineSequence';
+import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
 
 export function optimizeSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
 	let result = sequenceDiffs;
-	result = joinSequenceDiffs(sequence1, sequence2, result);
+	result = joinSequenceDiffsByShifting(sequence1, sequence2, result);
 	result = shiftSequenceDiffs(sequence1, sequence2, result);
 	return result;
 }
 
-export function smoothenSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
-	const result: SequenceDiff[] = [];
-	for (const s of sequenceDiffs) {
-		const last = result[result.length - 1];
-		if (!last) {
-			result.push(s);
-			continue;
-		}
-
-		if (s.seq1Range.start - last.seq1Range.endExclusive <= 2 || s.seq2Range.start - last.seq2Range.endExclusive <= 2) {
-			result[result.length - 1] = new SequenceDiff(last.seq1Range.join(s.seq1Range), last.seq2Range.join(s.seq2Range));
-		} else {
-			result.push(s);
-		}
-	}
-
-	return result;
-}
-
-export function removeRandomLineMatches(sequence1: LineSequence, _sequence2: LineSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
-	let diffs = sequenceDiffs;
-	if (diffs.length === 0) {
-		return diffs;
-	}
-
-	let counter = 0;
-	let shouldRepeat: boolean;
-	do {
-		shouldRepeat = false;
-
-		const result: SequenceDiff[] = [
-			diffs[0]
-		];
-
-		for (let i = 1; i < diffs.length; i++) {
-			const cur = diffs[i];
-			const lastResult = result[result.length - 1];
-
-			function shouldJoinDiffs(before: SequenceDiff, after: SequenceDiff): boolean {
-				const unchangedRange = new OffsetRange(lastResult.seq1Range.endExclusive, cur.seq1Range.start);
-
-				const unchangedText = sequence1.getText(unchangedRange);
-				const unchangedTextWithoutWs = unchangedText.replace(/\s/g, '');
-				if (unchangedTextWithoutWs.length <= 4
-					&& (before.seq1Range.length + before.seq2Range.length > 5 || after.seq1Range.length + after.seq2Range.length > 5)) {
-					return true;
-				}
-
-				return false;
-			}
-
-			const shouldJoin = shouldJoinDiffs(lastResult, cur);
-			if (shouldJoin) {
-				shouldRepeat = true;
-				result[result.length - 1] = result[result.length - 1].join(cur);
-			} else {
-				result.push(cur);
-			}
-		}
-
-		diffs = result;
-	} while (counter++ < 10 && shouldRepeat);
-
-	return diffs;
-}
-
-
-export function removeRandomMatches(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
-	let diffs = sequenceDiffs;
-	if (diffs.length === 0) {
-		return diffs;
-	}
-
-	let counter = 0;
-	let shouldRepeat: boolean;
-	do {
-		shouldRepeat = false;
-
-		const result: SequenceDiff[] = [
-			diffs[0]
-		];
-
-		for (let i = 1; i < diffs.length; i++) {
-			const cur = diffs[i];
-			const lastResult = result[result.length - 1];
-
-			function shouldJoinDiffs(before: SequenceDiff, after: SequenceDiff): boolean {
-				const unchangedRange = new OffsetRange(lastResult.seq1Range.endExclusive, cur.seq1Range.start);
-
-				const unchangedLineCount = sequence1.countLinesIn(unchangedRange);
-				if (unchangedLineCount > 5 || unchangedRange.length > 500) {
-					return false;
-				}
-
-				const unchangedText = sequence1.getText(unchangedRange).trim();
-				if (unchangedText.length > 20 || unchangedText.split(/\r\n|\r|\n/).length > 1) {
-					return false;
-				}
-
-				const beforeLineCount1 = sequence1.countLinesIn(before.seq1Range);
-				const beforeSeq1Length = before.seq1Range.length;
-				const beforeLineCount2 = sequence2.countLinesIn(before.seq2Range);
-				const beforeSeq2Length = before.seq2Range.length;
-
-				const afterLineCount1 = sequence1.countLinesIn(after.seq1Range);
-				const afterSeq1Length = after.seq1Range.length;
-				const afterLineCount2 = sequence2.countLinesIn(after.seq2Range);
-				const afterSeq2Length = after.seq2Range.length;
-
-				// TODO: Maybe a neural net can be used to derive the result from these numbers
-
-				const max = 2 * 40 + 50;
-				function cap(v: number): number {
-					return Math.min(v, max);
-				}
-
-				if (Math.pow(Math.pow(cap(beforeLineCount1 * 40 + beforeSeq1Length), 1.5) + Math.pow(cap(beforeLineCount2 * 40 + beforeSeq2Length), 1.5), 1.5)
-					+ Math.pow(Math.pow(cap(afterLineCount1 * 40 + afterSeq1Length), 1.5) + Math.pow(cap(afterLineCount2 * 40 + afterSeq2Length), 1.5), 1.5) > ((max ** 1.5) ** 1.5) * 1.3) {
-					return true;
-				}
-				return false;
-			}
-
-			const shouldJoin = shouldJoinDiffs(lastResult, cur);
-			if (shouldJoin) {
-				shouldRepeat = true;
-				result[result.length - 1] = result[result.length - 1].join(cur);
-			} else {
-				result.push(cur);
-			}
-		}
-
-		diffs = result;
-	} while (counter++ < 10 && shouldRepeat);
-
-	// Remove short suffixes/prefixes
-	for (let i = 0; i < diffs.length; i++) {
-		const cur = diffs[i];
-
-		let range1 = cur.seq1Range;
-		let range2 = cur.seq2Range;
-
-		const fullRange1 = sequence1.extendToFullLines(cur.seq1Range);
-		const prefix = sequence1.getText(new OffsetRange(fullRange1.start, cur.seq1Range.start));
-		if (prefix.length > 0 && prefix.trim().length <= 3 && cur.seq1Range.length + cur.seq2Range.length > 100) {
-			range1 = cur.seq1Range.deltaStart(-prefix.length);
-			range2 = cur.seq2Range.deltaStart(-prefix.length);
-		}
-
-		const suffix = sequence1.getText(new OffsetRange(cur.seq1Range.endExclusive, fullRange1.endExclusive));
-		if (suffix.length > 0 && (suffix.trim().length <= 3 && cur.seq1Range.length + cur.seq2Range.length > 150)) {
-			range1 = range1.deltaEnd(suffix.length);
-			range2 = range2.deltaEnd(suffix.length);
-		}
-
-		diffs[i] = new SequenceDiff(range1, range2);
-	}
-
-	return diffs;
-}
-
 /**
  * This function fixes issues like this:
  * ```
@@ -187,7 +27,7 @@ export function removeRandomMatches(sequence1: LinesSliceCharSequence, sequence2
  * Computed diff: [ {Add "," after Bar}, {Add "Foo " after space} }
  * Improved diff: [{Add ", Foo" after Bar}]
  */
-export function joinSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+function joinSequenceDiffsByShifting(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
 	if (sequenceDiffs.length === 0) {
 		return sequenceDiffs;
 	}
@@ -285,7 +125,7 @@ export function joinSequenceDiffs(sequence1: ISequence, sequence2: ISequence, se
 // ->
 // collectBrackets(level + 1, [levelPerBracket + 1, ]levelPerBracketType);
 
-export function shiftSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+function shiftSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
 	if (!sequence1.getBoundaryScore || !sequence2.getBoundaryScore) {
 		return sequenceDiffs;
 	}
@@ -301,7 +141,7 @@ export function shiftSequenceDiffs(sequence1: ISequence, sequence2: ISequence, s
 		if (diff.seq1Range.isEmpty) {
 			sequenceDiffs[i] = shiftDiffToBetterPosition(diff, sequence1, sequence2, seq1ValidRange, seq2ValidRange);
 		} else if (diff.seq2Range.isEmpty) {
-			sequenceDiffs[i] = shiftDiffToBetterPosition(diff.reverse(), sequence2, sequence1, seq2ValidRange, seq1ValidRange).reverse();
+			sequenceDiffs[i] = shiftDiffToBetterPosition(diff.swap(), sequence2, sequence1, seq2ValidRange, seq1ValidRange).swap();
 		}
 	}
 
@@ -355,3 +195,258 @@ function shiftDiffToBetterPosition(diff: SequenceDiff, sequence1: ISequence, seq
 
 	return diff.delta(bestDelta);
 }
+
+export function smoothenSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+	const result: SequenceDiff[] = [];
+	for (const s of sequenceDiffs) {
+		const last = result[result.length - 1];
+		if (!last) {
+			result.push(s);
+			continue;
+		}
+
+		if (s.seq1Range.start - last.seq1Range.endExclusive <= 2 || s.seq2Range.start - last.seq2Range.endExclusive <= 2) {
+			result[result.length - 1] = new SequenceDiff(last.seq1Range.join(s.seq1Range), last.seq2Range.join(s.seq2Range));
+		} else {
+			result.push(s);
+		}
+	}
+
+	return result;
+}
+
+export function extendDiffsToEntireWordIfAppropriate(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+	const additional: SequenceDiff[] = [];
+
+	let lastModifiedWord: { added: number; deleted: number; count: number; s1Range: OffsetRange; s2Range: OffsetRange } | undefined = undefined;
+
+	function maybePushWordToAdditional() {
+		if (!lastModifiedWord) {
+			return;
+		}
+
+		const originalLength1 = lastModifiedWord.s1Range.length - lastModifiedWord.deleted;
+		const originalLength2 = lastModifiedWord.s2Range.length - lastModifiedWord.added;
+		if (originalLength1 !== originalLength2) {
+			// TODO figure out why this happens
+		}
+
+		if (Math.max(lastModifiedWord.deleted, lastModifiedWord.added) + (lastModifiedWord.count - 1) > originalLength1) {
+			additional.push(new SequenceDiff(lastModifiedWord.s1Range, lastModifiedWord.s2Range));
+		}
+
+		lastModifiedWord = undefined;
+	}
+
+	for (const s of sequenceDiffs) {
+		function processWord(s1Range: OffsetRange, s2Range: OffsetRange) {
+			if (!lastModifiedWord || !lastModifiedWord.s1Range.containsRange(s1Range) || !lastModifiedWord.s2Range.containsRange(s2Range)) {
+				if (lastModifiedWord && !(lastModifiedWord.s1Range.endExclusive < s1Range.start && lastModifiedWord.s2Range.endExclusive < s2Range.start)) {
+					const s1Added = OffsetRange.tryCreate(lastModifiedWord.s1Range.endExclusive, s1Range.start);
+					const s2Added = OffsetRange.tryCreate(lastModifiedWord.s2Range.endExclusive, s2Range.start);
+					lastModifiedWord.deleted += s1Added?.length ?? 0;
+					lastModifiedWord.added += s2Added?.length ?? 0;
+
+					lastModifiedWord.s1Range = lastModifiedWord.s1Range.join(s1Range);
+					lastModifiedWord.s2Range = lastModifiedWord.s2Range.join(s2Range);
+				} else {
+					maybePushWordToAdditional();
+					lastModifiedWord = { added: 0, deleted: 0, count: 0, s1Range: s1Range, s2Range: s2Range };
+				}
+			}
+
+			const changedS1 = s1Range.intersect(s.seq1Range);
+			const changedS2 = s2Range.intersect(s.seq2Range);
+			lastModifiedWord.count++;
+			lastModifiedWord.deleted += changedS1?.length ?? 0;
+			lastModifiedWord.added += changedS2?.length ?? 0;
+		}
+
+		const w1Before = sequence1.findWordContaining(s.seq1Range.start - 1);
+		const w2Before = sequence2.findWordContaining(s.seq2Range.start - 1);
+
+		const w1After = sequence1.findWordContaining(s.seq1Range.endExclusive);
+		const w2After = sequence2.findWordContaining(s.seq2Range.endExclusive);
+
+		if (w1Before && w1After && w2Before && w2After && w1Before.equals(w1After) && w2Before.equals(w2After)) {
+			processWord(w1Before, w2Before);
+		} else {
+			if (w1Before && w2Before) {
+				processWord(w1Before, w2Before);
+			}
+			if (w1After && w2After) {
+				processWord(w1After, w2After);
+			}
+		}
+	}
+
+	maybePushWordToAdditional();
+
+	const merged = mergeSequenceDiffs(sequenceDiffs, additional);
+	return merged;
+}
+
+function mergeSequenceDiffs(sequenceDiffs1: SequenceDiff[], sequenceDiffs2: SequenceDiff[]): SequenceDiff[] {
+	const result: SequenceDiff[] = [];
+
+	while (sequenceDiffs1.length > 0 || sequenceDiffs2.length > 0) {
+		const sd1 = sequenceDiffs1[0];
+		const sd2 = sequenceDiffs2[0];
+
+		let next: SequenceDiff;
+		if (sd1 && (!sd2 || sd1.seq1Range.start < sd2.seq1Range.start)) {
+			next = sequenceDiffs1.shift()!;
+		} else {
+			next = sequenceDiffs2.shift()!;
+		}
+
+		if (result.length > 0 && result[result.length - 1].seq1Range.endExclusive >= next.seq1Range.start) {
+			result[result.length - 1] = result[result.length - 1].join(next);
+		} else {
+			result.push(next);
+		}
+	}
+
+	return result;
+}
+
+export function removeRandomLineMatches(sequence1: LineSequence, _sequence2: LineSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+	let diffs = sequenceDiffs;
+	if (diffs.length === 0) {
+		return diffs;
+	}
+
+	let counter = 0;
+	let shouldRepeat: boolean;
+	do {
+		shouldRepeat = false;
+
+		const result: SequenceDiff[] = [
+			diffs[0]
+		];
+
+		for (let i = 1; i < diffs.length; i++) {
+			const cur = diffs[i];
+			const lastResult = result[result.length - 1];
+
+			function shouldJoinDiffs(before: SequenceDiff, after: SequenceDiff): boolean {
+				const unchangedRange = new OffsetRange(lastResult.seq1Range.endExclusive, cur.seq1Range.start);
+
+				const unchangedText = sequence1.getText(unchangedRange);
+				const unchangedTextWithoutWs = unchangedText.replace(/\s/g, '');
+				if (unchangedTextWithoutWs.length <= 4
+					&& (before.seq1Range.length + before.seq2Range.length > 5 || after.seq1Range.length + after.seq2Range.length > 5)) {
+					return true;
+				}
+
+				return false;
+			}
+
+			const shouldJoin = shouldJoinDiffs(lastResult, cur);
+			if (shouldJoin) {
+				shouldRepeat = true;
+				result[result.length - 1] = result[result.length - 1].join(cur);
+			} else {
+				result.push(cur);
+			}
+		}
+
+		diffs = result;
+	} while (counter++ < 10 && shouldRepeat);
+
+	return diffs;
+}
+
+export function removeRandomMatches(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+	let diffs = sequenceDiffs;
+	if (diffs.length === 0) {
+		return diffs;
+	}
+
+	let counter = 0;
+	let shouldRepeat: boolean;
+	do {
+		shouldRepeat = false;
+
+		const result: SequenceDiff[] = [
+			diffs[0]
+		];
+
+		for (let i = 1; i < diffs.length; i++) {
+			const cur = diffs[i];
+			const lastResult = result[result.length - 1];
+
+			function shouldJoinDiffs(before: SequenceDiff, after: SequenceDiff): boolean {
+				const unchangedRange = new OffsetRange(lastResult.seq1Range.endExclusive, cur.seq1Range.start);
+
+				const unchangedLineCount = sequence1.countLinesIn(unchangedRange);
+				if (unchangedLineCount > 5 || unchangedRange.length > 500) {
+					return false;
+				}
+
+				const unchangedText = sequence1.getText(unchangedRange).trim();
+				if (unchangedText.length > 20 || unchangedText.split(/\r\n|\r|\n/).length > 1) {
+					return false;
+				}
+
+				const beforeLineCount1 = sequence1.countLinesIn(before.seq1Range);
+				const beforeSeq1Length = before.seq1Range.length;
+				const beforeLineCount2 = sequence2.countLinesIn(before.seq2Range);
+				const beforeSeq2Length = before.seq2Range.length;
+
+				const afterLineCount1 = sequence1.countLinesIn(after.seq1Range);
+				const afterSeq1Length = after.seq1Range.length;
+				const afterLineCount2 = sequence2.countLinesIn(after.seq2Range);
+				const afterSeq2Length = after.seq2Range.length;
+
+				// TODO: Maybe a neural net can be used to derive the result from these numbers
+
+				const max = 2 * 40 + 50;
+				function cap(v: number): number {
+					return Math.min(v, max);
+				}
+
+				if (Math.pow(Math.pow(cap(beforeLineCount1 * 40 + beforeSeq1Length), 1.5) + Math.pow(cap(beforeLineCount2 * 40 + beforeSeq2Length), 1.5), 1.5)
+					+ Math.pow(Math.pow(cap(afterLineCount1 * 40 + afterSeq1Length), 1.5) + Math.pow(cap(afterLineCount2 * 40 + afterSeq2Length), 1.5), 1.5) > ((max ** 1.5) ** 1.5) * 1.3) {
+					return true;
+				}
+				return false;
+			}
+
+			const shouldJoin = shouldJoinDiffs(lastResult, cur);
+			if (shouldJoin) {
+				shouldRepeat = true;
+				result[result.length - 1] = result[result.length - 1].join(cur);
+			} else {
+				result.push(cur);
+			}
+		}
+
+		diffs = result;
+	} while (counter++ < 10 && shouldRepeat);
+
+	// Remove short suffixes/prefixes
+	for (let i = 0; i < diffs.length; i++) {
+		const cur = diffs[i];
+
+		let range1 = cur.seq1Range;
+		let range2 = cur.seq2Range;
+
+		const fullRange1 = sequence1.extendToFullLines(cur.seq1Range);
+		const prefix = sequence1.getText(new OffsetRange(fullRange1.start, cur.seq1Range.start));
+		if (prefix.length > 0 && prefix.trim().length <= 3 && cur.seq1Range.length + cur.seq2Range.length > 100) {
+			range1 = cur.seq1Range.deltaStart(-prefix.length);
+			range2 = cur.seq2Range.deltaStart(-prefix.length);
+		}
+
+		const suffix = sequence1.getText(new OffsetRange(cur.seq1Range.endExclusive, fullRange1.endExclusive));
+		if (suffix.length > 0 && (suffix.trim().length <= 3 && cur.seq1Range.length + cur.seq2Range.length > 150)) {
+			range1 = range1.deltaEnd(suffix.length);
+			range2 = range2.deltaEnd(suffix.length);
+		}
+
+		diffs[i] = new SequenceDiff(range1, range2);
+	}
+
+	return diffs;
+}
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.ts
new file mode 100644
index 00000000000..fd48f598de0
--- /dev/null
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.ts
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CharCode } from 'vs/base/common/charCode';
+import { OffsetRange } from 'vs/editor/common/core/offsetRange';
+import { ISequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
+
+export class LineSequence implements ISequence {
+	constructor(
+		private readonly trimmedHash: number[],
+		private readonly lines: string[]
+	) { }
+
+	getElement(offset: number): number {
+		return this.trimmedHash[offset];
+	}
+
+	get length(): number {
+		return this.trimmedHash.length;
+	}
+
+	getBoundaryScore(length: number): number {
+		const indentationBefore = length === 0 ? 0 : getIndentation(this.lines[length - 1]);
+		const indentationAfter = length === this.lines.length ? 0 : getIndentation(this.lines[length]);
+		return 1000 - (indentationBefore + indentationAfter);
+	}
+
+	getText(range: OffsetRange): string {
+		return this.lines.slice(range.start, range.endExclusive).join('\n');
+	}
+
+	isStronglyEqual(offset1: number, offset2: number): boolean {
+		return this.lines[offset1] === this.lines[offset2];
+	}
+}
+
+function getIndentation(str: string): number {
+	let i = 0;
+	while (i < str.length && (str.charCodeAt(i) === CharCode.Space || str.charCodeAt(i) === CharCode.Tab)) {
+		i++;
+	}
+	return i;
+}
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
new file mode 100644
index 00000000000..ca515f2cbbe
--- /dev/null
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { findLastIdxMonotonous, findLastMonotonous, findFirstMonotonous } from 'vs/base/common/arraysFind';
+import { CharCode } from 'vs/base/common/charCode';
+import { OffsetRange } from 'vs/editor/common/core/offsetRange';
+import { Position } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
+import { ISequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
+import { isSpace } from 'vs/editor/common/diff/defaultLinesDiffComputer/utils';
+
+export class LinesSliceCharSequence implements ISequence {
+	private readonly elements: number[] = [];
+	private readonly firstCharOffsetByLine: number[] = [];
+	public readonly lineRange: OffsetRange;
+	// To account for trimming
+	private readonly additionalOffsetByLine: number[] = [];
+
+	constructor(public readonly lines: string[], lineRange: OffsetRange, public readonly considerWhitespaceChanges: boolean) {
+		// This slice has to have lineRange.length many \n! (otherwise diffing against an empty slice will be problematic)
+		// (Unless it covers the entire document, in that case the other slice also has to cover the entire document ands it's okay)
+
+		// If the slice covers the end, but does not start at the beginning, we include just the \n of the previous line.
+		let trimFirstLineFully = false;
+		if (lineRange.start > 0 && lineRange.endExclusive >= lines.length) {
+			lineRange = new OffsetRange(lineRange.start - 1, lineRange.endExclusive);
+			trimFirstLineFully = true;
+		}
+
+		this.lineRange = lineRange;
+
+		this.firstCharOffsetByLine[0] = 0;
+		for (let i = this.lineRange.start; i < this.lineRange.endExclusive; i++) {
+			let line = lines[i];
+			let offset = 0;
+			if (trimFirstLineFully) {
+				offset = line.length;
+				line = '';
+				trimFirstLineFully = false;
+			} else if (!considerWhitespaceChanges) {
+				const trimmedStartLine = line.trimStart();
+				offset = line.length - trimmedStartLine.length;
+				line = trimmedStartLine.trimEnd();
+			}
+
+			this.additionalOffsetByLine.push(offset);
+
+			for (let i = 0; i < line.length; i++) {
+				this.elements.push(line.charCodeAt(i));
+			}
+
+			// Don't add an \n that does not exist in the document.
+			if (i < lines.length - 1) {
+				this.elements.push('\n'.charCodeAt(0));
+				this.firstCharOffsetByLine[i - this.lineRange.start + 1] = this.elements.length;
+			}
+		}
+		// To account for the last line
+		this.additionalOffsetByLine.push(0);
+	}
+
+	toString() {
+		return `Slice: "${this.text}"`;
+	}
+
+	get text(): string {
+		return this.getText(new OffsetRange(0, this.length));
+	}
+
+	getText(range: OffsetRange): string {
+		return this.elements.slice(range.start, range.endExclusive).map(e => String.fromCharCode(e)).join('');
+	}
+
+	getElement(offset: number): number {
+		return this.elements[offset];
+	}
+
+	get length(): number {
+		return this.elements.length;
+	}
+
+	public getBoundaryScore(length: number): number {
+		//   a   b   c   ,           d   e   f
+		// 11  0   0   12  15  6   13  0   0   11
+
+		const prevCategory = getCategory(length > 0 ? this.elements[length - 1] : -1);
+		const nextCategory = getCategory(length < this.elements.length ? this.elements[length] : -1);
+
+		if (prevCategory === CharBoundaryCategory.LineBreakCR && nextCategory === CharBoundaryCategory.LineBreakLF) {
+			// don't break between \r and \n
+			return 0;
+		}
+
+		let score = 0;
+		if (prevCategory !== nextCategory) {
+			score += 10;
+			if (nextCategory === CharBoundaryCategory.WordUpper) {
+				score += 1;
+			}
+		}
+
+		score += getCategoryBoundaryScore(prevCategory);
+		score += getCategoryBoundaryScore(nextCategory);
+
+		return score;
+	}
+
+	public translateOffset(offset: number): Position {
+		// find smallest i, so that lineBreakOffsets[i] <= offset using binary search
+		if (this.lineRange.isEmpty) {
+			return new Position(this.lineRange.start + 1, 1);
+		}
+
+		const i = findLastIdxMonotonous(this.firstCharOffsetByLine, (value) => value <= offset);
+		return new Position(this.lineRange.start + i + 1, offset - this.firstCharOffsetByLine[i] + this.additionalOffsetByLine[i] + 1);
+	}
+
+	public translateRange(range: OffsetRange): Range {
+		return Range.fromPositions(this.translateOffset(range.start), this.translateOffset(range.endExclusive));
+	}
+
+	/**
+	 * Finds the word that contains the character at the given offset
+	 */
+	public findWordContaining(offset: number): OffsetRange | undefined {
+		if (offset < 0 || offset >= this.elements.length) {
+			return undefined;
+		}
+
+		if (!isWordChar(this.elements[offset])) {
+			return undefined;
+		}
+
+		// find start
+		let start = offset;
+		while (start > 0 && isWordChar(this.elements[start - 1])) {
+			start--;
+		}
+
+		// find end
+		let end = offset;
+		while (end < this.elements.length && isWordChar(this.elements[end])) {
+			end++;
+		}
+
+		return new OffsetRange(start, end);
+	}
+
+	public countLinesIn(range: OffsetRange): number {
+		return this.translateOffset(range.endExclusive).lineNumber - this.translateOffset(range.start).lineNumber;
+	}
+
+	public isStronglyEqual(offset1: number, offset2: number): boolean {
+		return this.elements[offset1] === this.elements[offset2];
+	}
+
+	public extendToFullLines(range: OffsetRange): OffsetRange {
+		const start = findLastMonotonous(this.firstCharOffsetByLine, x => x <= range.start) ?? 0;
+		const end = findFirstMonotonous(this.firstCharOffsetByLine, x => range.endExclusive <= x) ?? this.elements.length;
+		return new OffsetRange(start, end);
+	}
+}
+
+function isWordChar(charCode: number): boolean {
+	return charCode >= CharCode.a && charCode <= CharCode.z
+		|| charCode >= CharCode.A && charCode <= CharCode.Z
+		|| charCode >= CharCode.Digit0 && charCode <= CharCode.Digit9;
+}
+
+const enum CharBoundaryCategory {
+	WordLower,
+	WordUpper,
+	WordNumber,
+	End,
+	Other,
+	Space,
+	LineBreakCR,
+	LineBreakLF,
+}
+
+const score: Record<CharBoundaryCategory, number> = {
+	[CharBoundaryCategory.WordLower]: 0,
+	[CharBoundaryCategory.WordUpper]: 0,
+	[CharBoundaryCategory.WordNumber]: 0,
+	[CharBoundaryCategory.End]: 10,
+	[CharBoundaryCategory.Other]: 2,
+	[CharBoundaryCategory.Space]: 3,
+	[CharBoundaryCategory.LineBreakCR]: 10,
+	[CharBoundaryCategory.LineBreakLF]: 10,
+};
+
+function getCategoryBoundaryScore(category: CharBoundaryCategory): number {
+	return score[category];
+}
+
+function getCategory(charCode: number): CharBoundaryCategory {
+	if (charCode === CharCode.LineFeed) {
+		return CharBoundaryCategory.LineBreakLF;
+	} else if (charCode === CharCode.CarriageReturn) {
+		return CharBoundaryCategory.LineBreakCR;
+	} else if (isSpace(charCode)) {
+		return CharBoundaryCategory.Space;
+	} else if (charCode >= CharCode.a && charCode <= CharCode.z) {
+		return CharBoundaryCategory.WordLower;
+	} else if (charCode >= CharCode.A && charCode <= CharCode.Z) {
+		return CharBoundaryCategory.WordUpper;
+	} else if (charCode >= CharCode.Digit0 && charCode <= CharCode.Digit9) {
+		return CharBoundaryCategory.WordNumber;
+	} else if (charCode === -1) {
+		return CharBoundaryCategory.End;
+	} else {
+		return CharBoundaryCategory.Other;
+	}
+}
+
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/utils.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/utils.ts
new file mode 100644
index 00000000000..533b71e3740
--- /dev/null
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/utils.ts
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CharCode } from 'vs/base/common/charCode';
+import { LineRange } from 'vs/editor/common/core/lineRange';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
+
+export class Array2D<T> {
+	private readonly array: T[] = [];
+
+	constructor(public readonly width: number, public readonly height: number) {
+		this.array = new Array<T>(width * height);
+	}
+
+	get(x: number, y: number): T {
+		return this.array[x + y * this.width];
+	}
+
+	set(x: number, y: number, value: T): void {
+		this.array[x + y * this.width] = value;
+	}
+}
+
+export function isSpace(charCode: number): boolean {
+	return charCode === CharCode.Space || charCode === CharCode.Tab;
+}
+
+export class LineRangeFragment {
+	private static chrKeys = new Map<string, number>();
+
+	private static getKey(chr: string): number {
+		let key = this.chrKeys.get(chr);
+		if (key === undefined) {
+			key = this.chrKeys.size;
+			this.chrKeys.set(chr, key);
+		}
+		return key;
+	}
+
+	private readonly totalCount: number;
+	private readonly histogram: number[] = [];
+	constructor(
+		public readonly range: LineRange,
+		public readonly lines: string[],
+		public readonly source: DetailedLineRangeMapping,
+	) {
+		let counter = 0;
+		for (let i = range.startLineNumber - 1; i < range.endLineNumberExclusive - 1; i++) {
+			const line = lines[i];
+			for (let j = 0; j < line.length; j++) {
+				counter++;
+				const chr = line[j];
+				const key = LineRangeFragment.getKey(chr);
+				this.histogram[key] = (this.histogram[key] || 0) + 1;
+			}
+			counter++;
+			const key = LineRangeFragment.getKey('\n');
+			this.histogram[key] = (this.histogram[key] || 0) + 1;
+		}
+
+		this.totalCount = counter;
+	}
+
+	public computeSimilarity(other: LineRangeFragment): number {
+		let sumDifferences = 0;
+		const maxLength = Math.max(this.histogram.length, other.histogram.length);
+		for (let i = 0; i < maxLength; i++) {
+			sumDifferences += Math.abs((this.histogram[i] ?? 0) - (other.histogram[i] ?? 0));
+		}
+		return 1 - (sumDifferences / (this.totalCount + other.totalCount));
+	}
+}
diff --git a/src/vs/editor/common/diff/linesDiffComputers.ts b/src/vs/editor/common/diff/linesDiffComputers.ts
index 727b91455b7..75c63fe6552 100644
--- a/src/vs/editor/common/diff/linesDiffComputers.ts
+++ b/src/vs/editor/common/diff/linesDiffComputers.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { LegacyLinesDiffComputer } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { AdvancedLinesDiffComputer } from 'vs/editor/common/diff/advancedLinesDiffComputer';
+import { DefaultLinesDiffComputer } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
+import { ILinesDiffComputer } from 'vs/editor/common/diff/linesDiffComputer';
 
 export const linesDiffComputers = {
 	getLegacy: () => new LegacyLinesDiffComputer(),
-	getAdvanced: () => new AdvancedLinesDiffComputer(),
-};
+	getDefault: () => new DefaultLinesDiffComputer(),
+} satisfies Record<string, () => ILinesDiffComputer>;
diff --git a/src/vs/editor/common/diff/rangeMapping.ts b/src/vs/editor/common/diff/rangeMapping.ts
index 12ac2a362e9..9b69d90fbad 100644
--- a/src/vs/editor/common/diff/rangeMapping.ts
+++ b/src/vs/editor/common/diff/rangeMapping.ts
@@ -6,6 +6,9 @@
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { Range } from 'vs/editor/common/core/range';
 
+/**
+ * Maps a line range in the original text model to a line range in the modified text model.
+ */
 export class LineRangeMapping {
 	public static inverse(mapping: readonly DetailedLineRangeMapping[], originalLineCount: number, modifiedLineCount: number): DetailedLineRangeMapping[] {
 		const result: DetailedLineRangeMapping[] = [];
@@ -76,6 +79,7 @@ export class LineRangeMapping {
 
 /**
  * Maps a line range in the original text model to a line range in the modified text model.
+ * Also contains inner range mappings.
  */
 export class DetailedLineRangeMapping extends LineRangeMapping {
 	/**
@@ -116,7 +120,6 @@ export class RangeMapping {
 
 	constructor(
 		originalRange: Range,
-
 		modifiedRange: Range
 	) {
 		this.originalRange = originalRange;
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index 335e6b5c883..86ae8f966a4 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -414,7 +414,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 	}
 
 	private static computeDiff(originalTextModel: ICommonModel | ITextModel, modifiedTextModel: ICommonModel | ITextModel, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): IDiffComputationResult {
-		const diffAlgorithm: ILinesDiffComputer = algorithm === 'advanced' ? linesDiffComputers.getAdvanced() : linesDiffComputers.getLegacy();
+		const diffAlgorithm: ILinesDiffComputer = algorithm === 'advanced' ? linesDiffComputers.getDefault() : linesDiffComputers.getLegacy();
 
 		const originalLines = originalTextModel.getLinesContent();
 		const modifiedLines = modifiedTextModel.getLinesContent();
@@ -610,7 +610,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 			const originalLines = original.split(/\r\n|\n|\r/);
 			const modifiedLines = text.split(/\r\n|\n|\r/);
 
-			const diff = linesDiffComputers.getAdvanced().computeDiff(originalLines, modifiedLines, options);
+			const diff = linesDiffComputers.getDefault().computeDiff(originalLines, modifiedLines, options);
 
 			const start = Range.lift(range).getStartPosition();
 
diff --git a/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts b/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
index f5e4bbacdbc..60a055761da 100644
--- a/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
+++ b/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { Range } from 'vs/editor/common/core/range';
 import { RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { LinesSliceCharSequence, getLineRangeMapping } from 'vs/editor/common/diff/advancedLinesDiffComputer';
+import { LinesSliceCharSequence, getLineRangeMapping } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
 
 suite('lineRangeMapping', () => {
diff --git a/src/vs/editor/test/node/diffing/diffingFixture.test.ts b/src/vs/editor/test/node/diffing/diffingFixture.test.ts
index 89490813b78..bb42c69d62c 100644
--- a/src/vs/editor/test/node/diffing/diffingFixture.test.ts
+++ b/src/vs/editor/test/node/diffing/diffingFixture.test.ts
@@ -10,7 +10,7 @@ import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { FileAccess } from 'vs/base/common/network';
 import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { LegacyLinesDiffComputer } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { AdvancedLinesDiffComputer } from 'vs/editor/common/diff/advancedLinesDiffComputer';
+import { DefaultLinesDiffComputer } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
 
 suite('diff fixtures', () => {
 	setup(() => {
@@ -38,7 +38,7 @@ suite('diff fixtures', () => {
 		const secondContent = readFileSync(join(folderPath, secondFileName), 'utf8').replaceAll('\r\n', '\n').replaceAll('\r', '\n');
 		const secondContentLines = secondContent.split(/\n/);
 
-		const diffingAlgo = diffingAlgoName === 'legacy' ? new LegacyLinesDiffComputer() : new AdvancedLinesDiffComputer();
+		const diffingAlgo = diffingAlgoName === 'legacy' ? new LegacyLinesDiffComputer() : new DefaultLinesDiffComputer();
 
 		const ignoreTrimWhitespace = folder.indexOf('trimws') >= 0;
 		const diff = diffingAlgo.computeDiff(firstContentLines, secondContentLines, { ignoreTrimWhitespace, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false });
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 51ce58011f8..b6519772cc2 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -2494,6 +2494,7 @@ declare namespace monaco.editor {
 
 	/**
 	 * Maps a line range in the original text model to a line range in the modified text model.
+	 * Also contains inner range mappings.
 	 */
 	export class DetailedLineRangeMapping extends LineRangeMapping {
 		/**
@@ -2524,6 +2525,9 @@ declare namespace monaco.editor {
 		flip(): RangeMapping;
 	}
 
+	/**
+	 * Maps a line range in the original text model to a line range in the modified text model.
+	 */
 	export class LineRangeMapping {
 		static inverse(mapping: readonly DetailedLineRangeMapping[], originalLineCount: number, modifiedLineCount: number): DetailedLineRangeMapping[];
 		/**

From 71dd6e73a04a26645550c5120187b5cdbbbb5f7f Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 4 Sep 2023 10:36:23 +0200
Subject: [PATCH 55/94] Fixes CI

---
 .../editor/test/node/diffing/advancedLinesDiffComputer.test.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts b/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
index 60a055761da..31fa3e3086e 100644
--- a/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
+++ b/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
@@ -6,8 +6,9 @@
 import * as assert from 'assert';
 import { Range } from 'vs/editor/common/core/range';
 import { RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { LinesSliceCharSequence, getLineRangeMapping } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
+import { getLineRangeMapping } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
+import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
 
 suite('lineRangeMapping', () => {
 	test('1', () => {

From e9f7140ea818efbd343898a1dec0b7c2cf9f7b91 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Mon, 4 Sep 2023 11:36:49 +0200
Subject: [PATCH 56/94] Fix invalid match on `exited` DAP event

DAP spec states that the event is `exited` not `exit`
https://microsoft.github.io/debug-adapter-protocol/specification#Events_Exited
---
 src/vs/workbench/contrib/debug/browser/rawDebugSession.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
index c7201795adf..de7be37fe8f 100644
--- a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -142,7 +142,7 @@ export class RawDebugSession implements IDisposable {
 				case 'terminated':
 					this._onDidTerminateDebugee.fire(<DebugProtocol.TerminatedEvent>event);
 					break;
-				case 'exit':
+				case 'exited':
 					this._onDidExitDebugee.fire(<DebugProtocol.ExitedEvent>event);
 					break;
 				case 'progressStart':

From 63d4fe776bceeaea6906f882918699d7f054b611 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 4 Sep 2023 13:30:46 +0200
Subject: [PATCH 57/94] fix #191860 (#192121)

---
 .../browser/extensions.contribution.ts        | 10 +++++++++
 test/automation/src/extensions.ts             | 22 +++++--------------
 test/automation/src/workbench.ts              |  2 +-
 .../src/areas/extensions/extensions.test.ts   |  3 +--
 .../src/areas/workbench/localization.test.ts  |  1 -
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 3d40bfa801d..ff33245ded3 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -532,6 +532,16 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			order: 3
 		}));
 
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.focusExtensionsView',
+			title: { value: localize('focusExtensions', "Focus on Extensions View"), original: 'Focus on Extensions View' },
+			category: ExtensionsLocalizedLabel,
+			f1: true,
+			run: async (accessor: ServicesAccessor) => {
+				await accessor.get(IPaneCompositePartService).openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
+			}
+		});
+
 		this.registerExtensionAction({
 			id: 'workbench.extensions.action.installExtensions',
 			title: { value: localize('installExtensions', "Install Extensions"), original: 'Install Extensions' },
diff --git a/test/automation/src/extensions.ts b/test/automation/src/extensions.ts
index 7168258d308..08bb4585f61 100644
--- a/test/automation/src/extensions.ts
+++ b/test/automation/src/extensions.ts
@@ -9,30 +9,18 @@ import path = require('path');
 import fs = require('fs');
 import { ncp } from 'ncp';
 import { promisify } from 'util';
+import { Commands } from './workbench';
 
-const SEARCH_BOX = 'div.extensions-viewlet[id="workbench.view.extensions"] .monaco-editor textarea';
-const REFRESH_BUTTON = 'div.part.sidebar.left[id="workbench.parts.sidebar"] .codicon.codicon-extensions-refresh';
 
 export class Extensions extends Viewlet {
 
-	constructor(code: Code) {
+	constructor(code: Code, private commands: Commands) {
 		super(code);
 	}
 
-	async openExtensionsViewlet(): Promise<any> {
-		if (process.platform === 'darwin') {
-			await this.code.dispatchKeybinding('cmd+shift+x');
-		} else {
-			await this.code.dispatchKeybinding('ctrl+shift+x');
-		}
-
-		await this.code.waitForActiveElement(SEARCH_BOX);
-	}
-
 	async searchForExtension(id: string): Promise<any> {
-		await this.code.waitAndClick(SEARCH_BOX);
-		await this.code.waitForActiveElement(SEARCH_BOX);
-		await this.code.waitForTypeInEditor(SEARCH_BOX, `@id:${id}`);
+		await this.commands.runCommand('workbench.extensions.action.focusExtensionsView');
+		await this.code.waitForTypeInEditor('div.extensions-viewlet[id="workbench.view.extensions"] .monaco-editor textarea', `@id:${id}`);
 		await this.code.waitForTextContent(`div.part.sidebar div.composite.title h2`, 'Extensions: Marketplace');
 
 		let retrials = 1;
@@ -41,7 +29,7 @@ export class Extensions extends Viewlet {
 				return await this.code.waitForElement(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[data-extension-id="${id}"]`, undefined, 100);
 			} catch (error) {
 				this.code.logger.log(`Extension '${id}' is not found. Retrying count: ${retrials}`);
-				await this.code.waitAndClick(REFRESH_BUTTON);
+				await this.commands.runCommand('workbench.extensions.action.refreshExtension');
 			}
 		}
 		throw new Error(`Extension ${id} is not found`);
diff --git a/test/automation/src/workbench.ts b/test/automation/src/workbench.ts
index b951271d3b2..ffb628d16fd 100644
--- a/test/automation/src/workbench.ts
+++ b/test/automation/src/workbench.ts
@@ -55,7 +55,7 @@ export class Workbench {
 		this.explorer = new Explorer(code);
 		this.activitybar = new ActivityBar(code);
 		this.search = new Search(code);
-		this.extensions = new Extensions(code);
+		this.extensions = new Extensions(code, this.quickaccess);
 		this.editor = new Editor(code, this.quickaccess);
 		this.scm = new SCM(code);
 		this.debug = new Debug(code, this.quickaccess, this.editors, this.editor);
diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts
index a8120cb12bf..c78cbe87089 100644
--- a/test/smoke/src/areas/extensions/extensions.test.ts
+++ b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -7,7 +7,7 @@ import { Application, Logger } from '../../../../automation';
 import { installAllHandlers } from '../../utils';
 
 export function setup(logger: Logger) {
-	describe.skip('Extensions', () => {
+	describe('Extensions', () => {
 
 		// Shared before/after handling
 		installAllHandlers(logger);
@@ -15,7 +15,6 @@ export function setup(logger: Logger) {
 		it('install and enable vscode-smoketest-check extension', async function () {
 			const app = this.app as Application;
 
-			await app.workbench.extensions.openExtensionsViewlet();
 			await app.workbench.extensions.installExtension('ms-vscode.vscode-smoketest-check', true);
 
 			// Close extension editor because keybindings dispatch is not working when web views are opened and focused
diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts
index 4a5b62d8d7a..12e49ce549e 100644
--- a/test/smoke/src/areas/workbench/localization.test.ts
+++ b/test/smoke/src/areas/workbench/localization.test.ts
@@ -15,7 +15,6 @@ export function setup(logger: Logger) {
 		it('starts with "DE" locale and verifies title and viewlets text is in German', async function () {
 			const app = this.app as Application;
 
-			await app.workbench.extensions.openExtensionsViewlet();
 			await app.workbench.extensions.installExtension('ms-ceintl.vscode-language-pack-de', false);
 			await app.restart({ extraArgs: ['--locale=DE'] });
 

From f44e4ed8d43dfdce341599a0297e102923663eb9 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Mon, 4 Sep 2023 13:44:39 +0200
Subject: [PATCH 58/94] chore - some errors cleanup

---
 src/vs/base/common/errors.ts                     | 14 ++++----------
 .../workbench/api/browser/mainThreadEditors.ts   | 16 ++++++++--------
 src/vs/workbench/api/common/extHost.api.impl.ts  |  8 ++++----
 src/vs/workbench/api/common/extHostTextEditor.ts |  8 ++++----
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts
index a558a0b06d8..f0d9296057b 100644
--- a/src/vs/base/common/errors.ts
+++ b/src/vs/base/common/errors.ts
@@ -201,16 +201,10 @@ export function illegalState(name?: string): Error {
 	}
 }
 
-export function readonly(name?: string): Error {
-	return name
-		? new Error(`readonly property '${name} cannot be changed'`)
-		: new Error('readonly property cannot be changed');
-}
-
-export function disposed(what: string): Error {
-	const result = new Error(`${what} has been disposed`);
-	result.name = 'DISPOSED';
-	return result;
+export class ReadonlyError extends TypeError {
+	constructor(name?: string) {
+		super(name ? `${name} is read-only and cannot be changed` : 'Cannot change read-only property');
+	}
 }
 
 export function getErrorMessage(err: any): string {
diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts
index b5e8bb0ef56..84bc6f34f1e 100644
--- a/src/vs/workbench/api/browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditors.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { disposed } from 'vs/base/common/errors';
+import { illegalArgument } from 'vs/base/common/errors';
 import { IDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
 import { equals as objectEquals } from 'vs/base/common/objects';
 import { URI, UriComponents } from 'vs/base/common/uri';
@@ -174,7 +174,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 	$trySetSelections(id: string, selections: ISelection[]): Promise<void> {
 		const editor = this._editorLocator.getEditor(id);
 		if (!editor) {
-			return Promise.reject(disposed(`TextEditor(${id})`));
+			return Promise.reject(illegalArgument(`TextEditor(${id})`));
 		}
 		editor.setSelections(selections);
 		return Promise.resolve(undefined);
@@ -184,7 +184,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		key = `${this._instanceId}-${key}`;
 		const editor = this._editorLocator.getEditor(id);
 		if (!editor) {
-			return Promise.reject(disposed(`TextEditor(${id})`));
+			return Promise.reject(illegalArgument(`TextEditor(${id})`));
 		}
 		editor.setDecorations(key, ranges);
 		return Promise.resolve(undefined);
@@ -194,7 +194,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		key = `${this._instanceId}-${key}`;
 		const editor = this._editorLocator.getEditor(id);
 		if (!editor) {
-			return Promise.reject(disposed(`TextEditor(${id})`));
+			return Promise.reject(illegalArgument(`TextEditor(${id})`));
 		}
 		editor.setDecorationsFast(key, ranges);
 		return Promise.resolve(undefined);
@@ -203,7 +203,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): Promise<void> {
 		const editor = this._editorLocator.getEditor(id);
 		if (!editor) {
-			return Promise.reject(disposed(`TextEditor(${id})`));
+			return Promise.reject(illegalArgument(`TextEditor(${id})`));
 		}
 		editor.revealRange(range, revealType);
 		return Promise.resolve();
@@ -212,7 +212,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): Promise<void> {
 		const editor = this._editorLocator.getEditor(id);
 		if (!editor) {
-			return Promise.reject(disposed(`TextEditor(${id})`));
+			return Promise.reject(illegalArgument(`TextEditor(${id})`));
 		}
 		editor.setConfiguration(options);
 		return Promise.resolve(undefined);
@@ -221,7 +221,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): Promise<boolean> {
 		const editor = this._editorLocator.getEditor(id);
 		if (!editor) {
-			return Promise.reject(disposed(`TextEditor(${id})`));
+			return Promise.reject(illegalArgument(`TextEditor(${id})`));
 		}
 		return Promise.resolve(editor.applyEdits(modelVersionId, edits, opts));
 	}
@@ -229,7 +229,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 	$tryInsertSnippet(id: string, modelVersionId: number, template: string, ranges: readonly IRange[], opts: IUndoStopOptions): Promise<boolean> {
 		const editor = this._editorLocator.getEditor(id);
 		if (!editor) {
-			return Promise.reject(disposed(`TextEditor(${id})`));
+			return Promise.reject(illegalArgument(`TextEditor(${id})`));
 		}
 		return Promise.resolve(editor.insertSnippet(modelVersionId, template, ranges, opts));
 	}
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 5eadd12f6dd..95d016287a2 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -876,7 +876,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				return extHostWorkspace.getPath();
 			},
 			set rootPath(value) {
-				throw errors.readonly();
+				throw new errors.ReadonlyError('rootPath');
 			},
 			getWorkspaceFolder(resource) {
 				return extHostWorkspace.getWorkspaceFolder(resource);
@@ -888,13 +888,13 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				return extHostWorkspace.name;
 			},
 			set name(value) {
-				throw errors.readonly();
+				throw new errors.ReadonlyError('name');
 			},
 			get workspaceFile() {
 				return extHostWorkspace.workspaceFile;
 			},
 			set workspaceFile(value) {
-				throw errors.readonly();
+				throw new errors.ReadonlyError('workspaceFile');
 			},
 			updateWorkspaceFolders: (index, deleteCount, ...workspaceFoldersToAdd) => {
 				return extHostWorkspace.updateWorkspaceFolders(extension, index, deleteCount || 0, ...workspaceFoldersToAdd);
@@ -946,7 +946,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				return extHostDocuments.getAllDocumentData().map(data => data.document);
 			},
 			set textDocuments(value) {
-				throw errors.readonly();
+				throw new errors.ReadonlyError('textDocuments');
 			},
 			openTextDocument(uriOrFileNameOrOptions?: vscode.Uri | string | { language?: string; content?: string }) {
 				let uriPromise: Thenable<URI>;
diff --git a/src/vs/workbench/api/common/extHostTextEditor.ts b/src/vs/workbench/api/common/extHostTextEditor.ts
index c1317c709d9..8ab93b18b21 100644
--- a/src/vs/workbench/api/common/extHostTextEditor.ts
+++ b/src/vs/workbench/api/common/extHostTextEditor.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ok } from 'vs/base/common/assert';
-import { illegalArgument, readonly } from 'vs/base/common/errors';
+import { ReadonlyError, illegalArgument } from 'vs/base/common/errors';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
 import { IRange } from 'vs/editor/common/core/range';
@@ -431,7 +431,7 @@ export class ExtHostTextEditor {
 				return document.value;
 			},
 			set document(_value) {
-				throw readonly('document');
+				throw new ReadonlyError('document');
 			},
 			// --- selection
 			get selection(): Selection {
@@ -459,7 +459,7 @@ export class ExtHostTextEditor {
 				return that._visibleRanges;
 			},
 			set visibleRanges(_value: Range[]) {
-				throw readonly('visibleRanges');
+				throw new ReadonlyError('visibleRanges');
 			},
 			// --- options
 			get options(): vscode.TextEditorOptions {
@@ -475,7 +475,7 @@ export class ExtHostTextEditor {
 				return that._viewColumn;
 			},
 			set viewColumn(_value) {
-				throw readonly('viewColumn');
+				throw new ReadonlyError('viewColumn');
 			},
 			// --- edit
 			edit(callback: (edit: TextEditorEdit) => void, options: { undoStopBefore: boolean; undoStopAfter: boolean } = { undoStopBefore: true, undoStopAfter: true }): Promise<boolean> {

From 1ac6f50f44afc9073b25a1264fda084b0d434983 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Mon, 4 Sep 2023 14:36:16 +0200
Subject: [PATCH 59/94] Enable the `..` argument for git log (#188500)

* Enable the `..` argument for git log
This will return the commits that the `toRef` has but the `fromRef` does not.

* Use range instead
---
 extensions/git/src/api/git.d.ts | 2 ++
 extensions/git/src/git.ts       | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index ae1d57d3098..05af77899f0 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -129,6 +129,8 @@ export interface LogOptions {
 	/** Max number of log entries to retrieve. If not specified, the default is 32. */
 	readonly maxEntries?: number;
 	readonly path?: string;
+	/** A commit range, such as "0a47c67f0fb52dd11562af48658bc1dff1d75a38..0bb4bdea78e1db44d728fd6894720071e303304f" */
+	readonly range?: string;
 }
 
 export interface CommitOptions {
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 65d34af1e31..36dbac3a56e 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -1022,7 +1022,14 @@ export class Repository {
 
 	async log(options?: LogOptions): Promise<Commit[]> {
 		const maxEntries = options?.maxEntries ?? 32;
-		const args = ['log', `-n${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--'];
+		const args = ['log', `-n${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z'];
+
+		if (options?.range) {
+			args.push(options.range);
+		}
+
+		args.push('--');
+
 		if (options?.path) {
 			args.push(options.path);
 		}

From 9dd556a9e06a6f9b5d7e734fea9ec00d34071a63 Mon Sep 17 00:00:00 2001
From: justanotheranonymoususer
 <justanotheranonymoususer@users.noreply.github.com>
Date: Mon, 4 Sep 2023 15:44:03 +0300
Subject: [PATCH 60/94] Remove superfluous arg in git smoke.test.ts (#173194)

---
 extensions/git/src/test/smoke.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/git/src/test/smoke.test.ts b/extensions/git/src/test/smoke.test.ts
index 789086e90a4..b0070eb127f 100644
--- a/extensions/git/src/test/smoke.test.ts
+++ b/extensions/git/src/test/smoke.test.ts
@@ -122,7 +122,7 @@ suite('git smoke test', function () {
 		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.path && r.status === Status.UNTRACKED);
 		assert.strictEqual(repository.state.indexChanges.length, 0);
 
-		await commands.executeCommand('git.stageAll', appjs);
+		await commands.executeCommand('git.stageAll');
 		await repository.commit('third commit');
 		assert.strictEqual(repository.state.workingTreeChanges.length, 0);
 		assert.strictEqual(repository.state.indexChanges.length, 0);

From b481d52f179649efd19dc36199f150b3cd85f6eb Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 4 Sep 2023 14:36:53 +0200
Subject: [PATCH 61/94] Introduces ownership model to observable for better
 debug messages.

---
 src/vs/base/common/observableInternal/base.ts | 99 +++++++++++++++----
 .../base/common/observableInternal/derived.ts | 73 ++++++++++----
 .../base/common/observableInternal/utils.ts   | 31 +++---
 .../diffEditorWidget2/accessibleDiffViewer.ts |  8 +-
 .../diffEditorDecorations.ts                  |  3 +-
 .../diffEditorWidget2/diffEditorOptions.ts    | 49 +++++----
 .../diffEditorWidget2/diffEditorSash.ts       |  5 +-
 .../diffEditorWidget2/diffEditorViewModel.ts  | 25 +++--
 .../diffEditorWidget2/diffEditorWidget2.ts    | 15 ++-
 .../hideUnchangedRegionsFeature.ts            |  7 +-
 .../widget/diffEditorWidget2/lineAlignment.ts |  8 +-
 .../diffEditorWidget2/movedBlocksLines.ts     |  6 +-
 .../browser/widget/diffEditorWidget2/utils.ts | 10 +-
 .../browser/ghostTextWidget.ts                |  8 +-
 .../browser/inlineCompletionsController.ts    |  4 +-
 .../browser/inlineCompletionsHintsWidget.ts   |  3 +-
 .../browser/inlineCompletionsModel.ts         | 24 +++--
 .../browser/inlineCompletionsSource.ts        |  3 +-
 .../suggestWidgetInlineCompletionProvider.ts  |  2 +-
 .../contrib/debug/common/debugStorage.ts      | 10 +-
 .../browser/mergeEditorInputModel.ts          |  6 +-
 .../browser/model/mergeEditorModel.ts         | 48 ++++-----
 .../browser/model/textModelDiffs.ts           |  4 +-
 .../browser/view/conflictActions.ts           |  9 +-
 .../view/editors/baseCodeEditorView.ts        |  3 +-
 .../view/editors/inputCodeEditorView.ts       | 10 +-
 .../view/editors/resultCodeEditorView.ts      |  3 +-
 .../mergeEditor/browser/view/mergeEditor.ts   | 12 +--
 .../mergeEditor/browser/view/viewModel.ts     | 12 +--
 .../worker/textMateWorkerTokenizer.ts         |  2 +-
 30 files changed, 287 insertions(+), 215 deletions(-)

diff --git a/src/vs/base/common/observableInternal/base.ts b/src/vs/base/common/observableInternal/base.ts
index 23ba8d4af19..31e345a0bf2 100644
--- a/src/vs/base/common/observableInternal/base.ts
+++ b/src/vs/base/common/observableInternal/base.ts
@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDisposable } from 'vs/base/common/lifecycle';
-import type { derived } from 'vs/base/common/observableInternal/derived';
+import type { derivedOpts } from 'vs/base/common/observableInternal/derived';
 import { getLogger } from 'vs/base/common/observableInternal/logging';
 
 /**
  * Represents an observable value.
+ *
  * @template T The type of the value.
  * @template TChange The type of delta information (usually `void` and only used in advanced scenarios).
  */
@@ -118,6 +119,10 @@ export interface IObserver {
 }
 
 export interface ISettable<T, TChange = void> {
+	/**
+	 * Sets the value of the observable.
+	 * Use a transaction to batch multiple changes (with a transaction, observers only react at the end of the transaction).
+	 */
 	set(value: T, transaction: ITransaction | undefined, change: TChange): void;
 }
 
@@ -129,12 +134,12 @@ export interface ITransaction {
 	updateObserver(observer: IObserver, observable: IObservable<any, any>): void;
 }
 
-let _derived: typeof derived;
+let _derived: typeof derivedOpts;
 /**
  * @internal
  * This is to allow splitting files.
 */
-export function _setDerived(derived: typeof _derived) {
+export function _setDerivedOpts(derived: typeof _derived) {
 	_derived = derived;
 }
 
@@ -162,21 +167,23 @@ export abstract class ConvenientObservable<T, TChange> implements IObservable<T,
 	/** @sealed */
 	public map<TNew>(fn: (value: T, reader: IReader) => TNew): IObservable<TNew> {
 		return _derived(
-			(reader) => fn(this.read(reader), reader),
-			() => {
-				const name = getFunctionName(fn);
-				if (name !== undefined) {
-					return name;
-				}
+			{
+				debugName: () => {
+					const name = getFunctionName(fn);
+					if (name !== undefined) {
+						return name;
+					}
 
-				// regexp to match `x => x.y` where x and y can be arbitrary identifiers (uses backref):
-				const regexp = /^\s*\(?\s*([a-zA-Z_$][a-zA-Z_$0-9]*)\s*\)?\s*=>\s*\1\.([a-zA-Z_$][a-zA-Z_$0-9]*)\s*$/;
-				const match = regexp.exec(fn.toString());
-				if (match) {
-					return `${this.debugName}.${match[2]}`;
-				}
-				return `${this.debugName} (mapped)`;
+					// regexp to match `x => x.y` where x and y can be arbitrary identifiers (uses backref):
+					const regexp = /^\s*\(?\s*([a-zA-Z_$][a-zA-Z_$0-9]*)\s*\)?\s*=>\s*\1\.([a-zA-Z_$][a-zA-Z_$0-9]*)\s*$/;
+					const match = regexp.exec(fn.toString());
+					if (match) {
+						return `${this.debugName}.${match[2]}`;
+					}
+					return `${this.debugName} (mapped)`;
+				},
 			},
+			(reader) => fn(this.read(reader), reader),
 		);
 	}
 
@@ -252,6 +259,38 @@ export class TransactionImpl implements ITransaction {
 	}
 }
 
+export type DebugNameFn = string | (() => string | undefined);
+
+export function getDebugName(debugNameFn: DebugNameFn | undefined, fn: Function | undefined, owner: object | undefined, self: object): string | undefined {
+	let result: string | undefined;
+	if (debugNameFn !== undefined) {
+		if (typeof debugNameFn === 'function') {
+			result = debugNameFn();
+			if (result !== undefined) {
+				return result;
+			}
+		} else {
+			return debugNameFn;
+		}
+	}
+
+	if (fn !== undefined) {
+		result = getFunctionName(fn);
+		if (result !== undefined) {
+			return result;
+		}
+	}
+
+	if (owner !== undefined) {
+		for (const key in owner) {
+			if ((owner as any)[key] === self) {
+				return key;
+			}
+		}
+	}
+	return undefined;
+}
+
 export function getFunctionName(fn: Function): string | undefined {
 	const fnSrc = fn.toString();
 	// Pattern: /** @description ... */
@@ -268,8 +307,14 @@ export interface ISettableObservable<T, TChange = void> extends IObservable<T, T
  * Creates an observable value.
  * Observers get informed when the value changes.
  */
-export function observableValue<T, TChange = void>(name: string, initialValue: T): ISettableObservable<T, TChange> {
-	return new ObservableValue(name, initialValue);
+export function observableValue<T, TChange = void>(name: string, initialValue: T): ISettableObservable<T, TChange>;
+export function observableValue<T, TChange = void>(owner: object, initialValue: T): ISettableObservable<T, TChange>;
+export function observableValue<T, TChange = void>(nameOrOwner: string | object, initialValue: T): ISettableObservable<T, TChange> {
+	if (typeof nameOrOwner === 'string') {
+		return new ObservableValue(undefined, nameOrOwner, initialValue);
+	} else {
+		return new ObservableValue(nameOrOwner, undefined, initialValue);
+	}
 }
 
 export class ObservableValue<T, TChange = void>
@@ -278,7 +323,15 @@ export class ObservableValue<T, TChange = void>
 {
 	protected _value: T;
 
-	constructor(public readonly debugName: string, initialValue: T) {
+	get debugName() {
+		return getDebugName(this._debugName, undefined, this._owner, this) ?? 'ObservableValue';
+	}
+
+	constructor(
+		private readonly _owner: object | undefined,
+		private readonly _debugName: string | undefined,
+		initialValue: T
+	) {
 		super();
 		this._value = initialValue;
 	}
@@ -320,8 +373,12 @@ export class ObservableValue<T, TChange = void>
 	}
 }
 
-export function disposableObservableValue<T extends IDisposable | undefined, TChange = void>(name: string, initialValue: T): ISettableObservable<T, TChange> & IDisposable {
-	return new DisposableObservableValue(name, initialValue);
+export function disposableObservableValue<T extends IDisposable | undefined, TChange = void>(nameOrOwner: string | object, initialValue: T): ISettableObservable<T, TChange> & IDisposable {
+	if (typeof nameOrOwner === 'string') {
+		return new DisposableObservableValue(undefined, nameOrOwner, initialValue);
+	} else {
+		return new DisposableObservableValue(nameOrOwner, undefined, initialValue);
+	}
 }
 
 export class DisposableObservableValue<T extends IDisposable | undefined, TChange = void> extends ObservableValue<T, TChange> implements IDisposable {
diff --git a/src/vs/base/common/observableInternal/derived.ts b/src/vs/base/common/observableInternal/derived.ts
index 2cb17f2f9da..0f1abf6043e 100644
--- a/src/vs/base/common/observableInternal/derived.ts
+++ b/src/vs/base/common/observableInternal/derived.ts
@@ -5,39 +5,76 @@
 
 import { BugIndicatingError } from 'vs/base/common/errors';
 import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IReader, IObservable, BaseObservable, IObserver, _setDerived, IChangeContext, getFunctionName } from 'vs/base/common/observableInternal/base';
+import { IReader, IObservable, BaseObservable, IObserver, _setDerivedOpts, IChangeContext, getFunctionName, DebugNameFn, getDebugName } from 'vs/base/common/observableInternal/base';
 import { getLogger } from 'vs/base/common/observableInternal/logging';
 
 export type EqualityComparer<T> = (a: T, b: T) => boolean;
 const defaultEqualityComparer: EqualityComparer<any> = (a, b) => a === b;
 
-export function derived<T>(computeFn: (reader: IReader) => T, debugName?: string | (() => string)): IObservable<T> {
-	return new Derived(debugName, computeFn, undefined, undefined, undefined, defaultEqualityComparer);
+/**
+ * Creates an observable that is derived from other observables.
+ */
+export function derived<T>(computeFn: (reader: IReader) => T): IObservable<T>;
+export function derived<T>(owner: object, computeFn: (reader: IReader) => T): IObservable<T>;
+export function derived<T>(computeFnOrOwner: ((reader: IReader) => T) | object, computeFn?: ((reader: IReader) => T) | undefined): IObservable<T> {
+	if (computeFn !== undefined) {
+		return new Derived(computeFnOrOwner, undefined, computeFn, undefined, undefined, undefined, defaultEqualityComparer);
+	}
+	return new Derived(undefined, undefined, computeFnOrOwner as any, undefined, undefined, undefined, defaultEqualityComparer);
 }
 
-export function derivedOpts<T>(options: { debugName?: string | (() => string); equalityComparer?: EqualityComparer<T> }, computeFn: (reader: IReader) => T): IObservable<T> {
-	return new Derived(options.debugName, computeFn, undefined, undefined, undefined, options.equalityComparer ?? defaultEqualityComparer);
+export function derivedOpts<T>(
+	options: {
+		owner?: object;
+		debugName?: string | (() => string);
+		equalityComparer?: EqualityComparer<T>;
+	},
+	computeFn: (reader: IReader) => T
+): IObservable<T> {
+	return new Derived(options.owner, options.debugName, computeFn, undefined, undefined, undefined, options.equalityComparer ?? defaultEqualityComparer);
 }
 
 export function derivedHandleChanges<T, TChangeSummary>(
-	debugName: string | (() => string),
 	options: {
+		owner?: object;
+		debugName?: string | (() => string);
 		createEmptyChangeSummary: () => TChangeSummary;
 		handleChange: (context: IChangeContext, changeSummary: TChangeSummary) => boolean;
+		equalityComparer?: EqualityComparer<T>;
 	},
-	computeFn: (reader: IReader, changeSummary: TChangeSummary) => T): IObservable<T> {
-	return new Derived(debugName, computeFn, options.createEmptyChangeSummary, options.handleChange, undefined, defaultEqualityComparer);
+	computeFn: (reader: IReader, changeSummary: TChangeSummary) => T
+): IObservable<T> {
+	return new Derived(options.owner, options.debugName, computeFn, options.createEmptyChangeSummary, options.handleChange, undefined, options.equalityComparer ?? defaultEqualityComparer);
 }
 
-export function derivedWithStore<T>(name: string, computeFn: (reader: IReader, store: DisposableStore) => T): IObservable<T> {
+export function derivedWithStore<T>(computeFn: (reader: IReader, store: DisposableStore) => T): IObservable<T>;
+export function derivedWithStore<T>(owner: object, computeFn: (reader: IReader, store: DisposableStore) => T): IObservable<T>;
+export function derivedWithStore<T>(computeFnOrOwner: ((reader: IReader, store: DisposableStore) => T) | object, computeFnOrUndefined?: ((reader: IReader, store: DisposableStore) => T)): IObservable<T> {
+	let computeFn: (reader: IReader, store: DisposableStore) => T;
+	let owner: object | undefined;
+	if (computeFnOrUndefined === undefined) {
+		computeFn = computeFnOrOwner as any;
+		owner = undefined;
+	} else {
+		owner = computeFnOrOwner;
+		computeFn = computeFnOrUndefined as any;
+	}
+
 	const store = new DisposableStore();
-	return new Derived(name, r => {
-		store.clear();
-		return computeFn(r, store);
-	}, undefined, undefined, () => store.dispose(), defaultEqualityComparer);
+	return new Derived(
+		owner,
+		(() => getFunctionName(computeFn) ?? '(anonymous)'),
+		r => {
+			store.clear();
+			return computeFn(r, store);
+		}, undefined,
+		undefined,
+		() => store.dispose(),
+		defaultEqualityComparer
+	);
 }
 
-_setDerived(derived);
+_setDerivedOpts(derived);
 
 const enum DerivedState {
 	/** Initial state, no previous value, recomputation needed */
@@ -70,14 +107,12 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 	private changeSummary: TChangeSummary | undefined = undefined;
 
 	public override get debugName(): string {
-		if (!this._debugName) {
-			return getFunctionName(this._computeFn) || '(anonymous)';
-		}
-		return typeof this._debugName === 'function' ? this._debugName() : this._debugName;
+		return getDebugName(this._debugName, this._computeFn, this._owner, this) ?? '(anonymous)';
 	}
 
 	constructor(
-		private readonly _debugName: string | (() => string) | undefined,
+		private readonly _owner: object | undefined,
+		private readonly _debugName: DebugNameFn | undefined,
 		public readonly _computeFn: (reader: IReader, changeSummary: TChangeSummary) => T,
 		private readonly createChangeSummary: (() => TChangeSummary) | undefined,
 		private readonly _handleChange: ((context: IChangeContext, summary: TChangeSummary) => boolean) | undefined,
diff --git a/src/vs/base/common/observableInternal/utils.ts b/src/vs/base/common/observableInternal/utils.ts
index c0e0adba010..8717248dee9 100644
--- a/src/vs/base/common/observableInternal/utils.ts
+++ b/src/vs/base/common/observableInternal/utils.ts
@@ -6,7 +6,7 @@
 import { Event } from 'vs/base/common/event';
 import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { autorun } from 'vs/base/common/observableInternal/autorun';
-import { BaseObservable, ConvenientObservable, IObservable, IObserver, IReader, ITransaction, getFunctionName, observableValue, transaction } from 'vs/base/common/observableInternal/base';
+import { BaseObservable, ConvenientObservable, IObservable, IObserver, IReader, ITransaction, getDebugName, getFunctionName, observableValue, transaction } from 'vs/base/common/observableInternal/base';
 import { derived } from 'vs/base/common/observableInternal/derived';
 import { getLogger } from 'vs/base/common/observableInternal/logging';
 
@@ -207,10 +207,14 @@ class FromEventObservableSignal extends BaseObservable<void> {
  * Signals don't have a value - when they are triggered they indicate a change.
  * However, signals can carry a delta that is passed to observers.
  */
-export function observableSignal<TDelta = void>(
-	debugName: string
-): IObservableSignal<TDelta> {
-	return new ObservableSignal<TDelta>(debugName);
+export function observableSignal<TDelta = void>(debugName: string): IObservableSignal<TDelta>;
+export function observableSignal<TDelta = void>(owner: object): IObservableSignal<TDelta>;
+export function observableSignal<TDelta = void>(debugNameOrOwner: string | object): IObservableSignal<TDelta> {
+	if (typeof debugNameOrOwner === 'string') {
+		return new ObservableSignal<TDelta>(debugNameOrOwner);
+	} else {
+		return new ObservableSignal<TDelta>(undefined, debugNameOrOwner);
+	}
 }
 
 export interface IObservableSignal<TChange> extends IObservable<void, TChange> {
@@ -218,8 +222,13 @@ export interface IObservableSignal<TChange> extends IObservable<void, TChange> {
 }
 
 class ObservableSignal<TChange> extends BaseObservable<void, TChange> implements IObservableSignal<TChange> {
+	public get debugName() {
+		return getDebugName(this._debugName, undefined, this._owner, this) ?? 'Observable Signal';
+	}
+
 	constructor(
-		public readonly debugName: string
+		private readonly _debugName: string | undefined,
+		private readonly _owner?: object,
 	) {
 		super();
 	}
@@ -332,23 +341,23 @@ class KeepAliveObserver implements IObserver {
 	}
 }
 
-export function derivedObservableWithCache<T>(name: string, computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable<T> {
+export function derivedObservableWithCache<T>(computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable<T> {
 	let lastValue: T | undefined = undefined;
 	const observable = derived(reader => {
 		lastValue = computeFn(reader, lastValue);
 		return lastValue;
-	}, name);
+	});
 	return observable;
 }
 
-export function derivedObservableWithWritableCache<T>(name: string, computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable<T> & { clearCache(transaction: ITransaction): void } {
+export function derivedObservableWithWritableCache<T>(owner: object, computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable<T> & { clearCache(transaction: ITransaction): void } {
 	let lastValue: T | undefined = undefined;
 	const counter = observableValue('derivedObservableWithWritableCache.counter', 0);
-	const observable = derived(reader => {
+	const observable = derived(owner, reader => {
 		counter.read(reader);
 		lastValue = computeFn(reader, lastValue);
 		return lastValue;
-	}, name);
+	});
 	return Object.assign(observable, {
 		clearCache: (transaction: ITransaction) => {
 			lastValue = undefined;
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
index 5bb6c97f1e4..29022fd8bf1 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
@@ -54,7 +54,7 @@ export class AccessibleDiffViewer extends Disposable {
 		this._register(keepAlive(this.model, true));
 	}
 
-	private readonly model = derivedWithStore('model', (reader, store) => {
+	private readonly model = derivedWithStore(this, (reader, store) => {
 		const visible = this._visible.read(reader);
 		this._parentNode.style.visibility = visible ? 'visible' : 'hidden';
 		if (!visible) {
@@ -93,9 +93,9 @@ export class AccessibleDiffViewer extends Disposable {
 }
 
 class ViewModel extends Disposable {
-	private readonly _groups = observableValue<ViewElementGroup[]>('groups', []);
-	private readonly _currentGroupIdx = observableValue('currentGroupIdx', 0);
-	private readonly _currentElementIdx = observableValue('currentElementIdx', 0);
+	private readonly _groups = observableValue<ViewElementGroup[]>(this, []);
+	private readonly _currentGroupIdx = observableValue(this, 0);
+	private readonly _currentElementIdx = observableValue(this, 0);
 
 	public readonly groups: IObservable<ViewElementGroup[]> = this._groups;
 	public readonly currentGroup: IObservable<ViewElementGroup | undefined>
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts
index 504bfe8a12c..bdc8100df4a 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts
@@ -27,8 +27,7 @@ export class DiffEditorDecorations extends Disposable {
 		this._register(applyObservableDecorations(this._editors.modified, this._decorations.map(d => d?.modifiedDecorations || [])));
 	}
 
-	private readonly _decorations = derived((reader) => {
-		/** @description _decorations */
+	private readonly _decorations = derived(this, (reader) => {
 		const diff = this._diffModel.read(reader)?.diff.read(reader);
 		if (!diff) {
 			return null;
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions.ts
index 066eefdb1e5..ed0de92dad0 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions.ts
@@ -17,44 +17,43 @@ export class DiffEditorOptions {
 
 	constructor(options: Readonly<IDiffEditorConstructionOptions>, private readonly diffEditorWidth: IObservable<number>) {
 		const optionsCopy = { ...options, ...validateDiffEditorOptions(options, diffEditorDefaultOptions) };
-		this._options = observableValue('options', optionsCopy);
+		this._options = observableValue(this, optionsCopy);
 	}
 
-	public readonly couldShowInlineViewBecauseOfSize = derived(reader => /** @description couldShowInlineViewBecauseOfSize */ this._options.read(reader).renderSideBySide && this.diffEditorWidth.read(reader) <= this._options.read(reader).renderSideBySideInlineBreakpoint
+	public readonly couldShowInlineViewBecauseOfSize = derived(this, reader => this._options.read(reader).renderSideBySide && this.diffEditorWidth.read(reader) <= this._options.read(reader).renderSideBySideInlineBreakpoint
 	);
 
-	public readonly renderOverviewRuler = derived(reader => /** @description renderOverviewRuler */ this._options.read(reader).renderOverviewRuler);
-	public readonly renderSideBySide = derived(reader => /** @description renderSideBySide */ this._options.read(reader).renderSideBySide
+	public readonly renderOverviewRuler = derived(this, reader => this._options.read(reader).renderOverviewRuler);
+	public readonly renderSideBySide = derived(this, reader => this._options.read(reader).renderSideBySide
 		&& !(this._options.read(reader).useInlineViewWhenSpaceIsLimited && this.couldShowInlineViewBecauseOfSize.read(reader))
 	);
-	public readonly readOnly = derived(reader => /** @description readOnly */ this._options.read(reader).readOnly);
+	public readonly readOnly = derived(this, reader => this._options.read(reader).readOnly);
 
-	public readonly shouldRenderRevertArrows = derived(reader => {
-		/** @description shouldRenderRevertArrows */
+	public readonly shouldRenderRevertArrows = derived(this, reader => {
 		if (!this._options.read(reader).renderMarginRevertIcon) { return false; }
 		if (!this.renderSideBySide.read(reader)) { return false; }
 		if (this.readOnly.read(reader)) { return false; }
 		return true;
 	});
-	public readonly renderIndicators = derived(reader => /** @description renderIndicators */ this._options.read(reader).renderIndicators);
-	public readonly enableSplitViewResizing = derived(reader => /** @description enableSplitViewResizing */ this._options.read(reader).enableSplitViewResizing);
-	public readonly splitViewDefaultRatio = derived(reader => /** @description splitViewDefaultRatio */ this._options.read(reader).splitViewDefaultRatio);
-	public readonly ignoreTrimWhitespace = derived(reader => /** @description ignoreTrimWhitespace */ this._options.read(reader).ignoreTrimWhitespace);
-	public readonly maxComputationTimeMs = derived(reader => /** @description maxComputationTime */ this._options.read(reader).maxComputationTime);
-	public readonly showMoves = derived(reader => /** @description showMoves */ this._options.read(reader).experimental.showMoves! && this.renderSideBySide.read(reader));
-	public readonly isInEmbeddedEditor = derived(reader => /** @description isInEmbeddedEditor */ this._options.read(reader).isInEmbeddedEditor);
-	public readonly diffWordWrap = derived(reader => /** @description diffWordWrap */ this._options.read(reader).diffWordWrap);
-	public readonly originalEditable = derived(reader => /** @description originalEditable */ this._options.read(reader).originalEditable);
-	public readonly diffCodeLens = derived(reader => /** @description diffCodeLens */ this._options.read(reader).diffCodeLens);
-	public readonly accessibilityVerbose = derived(reader => /** @description accessibilityVerbose */ this._options.read(reader).accessibilityVerbose);
-	public readonly diffAlgorithm = derived(reader => /** @description diffAlgorithm */ this._options.read(reader).diffAlgorithm);
-	public readonly showEmptyDecorations = derived(reader => /** @description showEmptyDecorations */ this._options.read(reader).experimental.showEmptyDecorations!);
-	public readonly onlyShowAccessibleDiffViewer = derived(reader => /** @description onlyShowAccessibleDiffViewer */ this._options.read(reader).onlyShowAccessibleDiffViewer);
+	public readonly renderIndicators = derived(this, reader => this._options.read(reader).renderIndicators);
+	public readonly enableSplitViewResizing = derived(this, reader => this._options.read(reader).enableSplitViewResizing);
+	public readonly splitViewDefaultRatio = derived(this, reader => this._options.read(reader).splitViewDefaultRatio);
+	public readonly ignoreTrimWhitespace = derived(this, reader => this._options.read(reader).ignoreTrimWhitespace);
+	public readonly maxComputationTimeMs = derived(this, reader => this._options.read(reader).maxComputationTime);
+	public readonly showMoves = derived(this, reader => this._options.read(reader).experimental.showMoves! && this.renderSideBySide.read(reader));
+	public readonly isInEmbeddedEditor = derived(this, reader => this._options.read(reader).isInEmbeddedEditor);
+	public readonly diffWordWrap = derived(this, reader => this._options.read(reader).diffWordWrap);
+	public readonly originalEditable = derived(this, reader => this._options.read(reader).originalEditable);
+	public readonly diffCodeLens = derived(this, reader => this._options.read(reader).diffCodeLens);
+	public readonly accessibilityVerbose = derived(this, reader => this._options.read(reader).accessibilityVerbose);
+	public readonly diffAlgorithm = derived(this, reader => this._options.read(reader).diffAlgorithm);
+	public readonly showEmptyDecorations = derived(this, reader => this._options.read(reader).experimental.showEmptyDecorations!);
+	public readonly onlyShowAccessibleDiffViewer = derived(this, reader => this._options.read(reader).onlyShowAccessibleDiffViewer);
 
-	public readonly hideUnchangedRegions = derived(reader => /** @description hideUnchangedRegions */ this._options.read(reader).hideUnchangedRegions.enabled!);
-	public readonly hideUnchangedRegionsRevealLineCount = derived(reader => /** @description hideUnchangedRegions */ this._options.read(reader).hideUnchangedRegions.revealLineCount!);
-	public readonly hideUnchangedRegionsContextLineCount = derived(reader => /** @description hideUnchangedRegions */ this._options.read(reader).hideUnchangedRegions.contextLineCount!);
-	public readonly hideUnchangedRegionsMinimumLineCount = derived(reader => /** @description hideUnchangedRegions */ this._options.read(reader).hideUnchangedRegions.minimumLineCount!);
+	public readonly hideUnchangedRegions = derived(this, reader => this._options.read(reader).hideUnchangedRegions.enabled!);
+	public readonly hideUnchangedRegionsRevealLineCount = derived(this, reader => this._options.read(reader).hideUnchangedRegions.revealLineCount!);
+	public readonly hideUnchangedRegionsContextLineCount = derived(this, reader => this._options.read(reader).hideUnchangedRegions.contextLineCount!);
+	public readonly hideUnchangedRegionsMinimumLineCount = derived(this, reader => this._options.read(reader).hideUnchangedRegions.minimumLineCount!);
 
 	public updateOptions(changedOptions: IDiffEditorOptions): void {
 		const newDiffEditorOptions = validateDiffEditorOptions(changedOptions, this._options.get());
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorSash.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorSash.ts
index aa25a92dacf..3e6664ff846 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorSash.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorSash.ts
@@ -9,10 +9,9 @@ import { IObservable, IReader, autorun, derived, observableValue } from 'vs/base
 import { DiffEditorOptions } from './diffEditorOptions';
 
 export class DiffEditorSash extends Disposable {
-	private readonly _sashRatio = observableValue<number | undefined>('sashRatio', undefined);
+	private readonly _sashRatio = observableValue<number | undefined>(this, undefined);
 
-	public readonly sashLeft = derived(reader => {
-		/** @description sashLeft */
+	public readonly sashLeft = derived(this, reader => {
 		const ratio = this._sashRatio.read(reader) ?? this._options.splitViewDefaultRatio.read(reader);
 		return this._computeSashLeft(ratio, reader);
 	});
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
index 30697f69a85..60bd6f8cba8 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
@@ -20,19 +20,18 @@ import { combineTextEditInfos } from 'vs/editor/common/model/bracketPairsTextMod
 import { DiffEditorOptions } from './diffEditorOptions';
 
 export class DiffEditorViewModel extends Disposable implements IDiffEditorViewModel {
-	private readonly _isDiffUpToDate = observableValue<boolean>('isDiffUpToDate', false);
+	private readonly _isDiffUpToDate = observableValue<boolean>(this, false);
 	public readonly isDiffUpToDate: IObservable<boolean> = this._isDiffUpToDate;
 
 	private _lastDiff: IDocumentDiff | undefined;
-	private readonly _diff = observableValue<DiffState | undefined>('diff', undefined);
+	private readonly _diff = observableValue<DiffState | undefined>(this, undefined);
 	public readonly diff: IObservable<DiffState | undefined> = this._diff;
 
 	private readonly _unchangedRegions = observableValue<{ regions: UnchangedRegion[]; originalDecorationIds: string[]; modifiedDecorationIds: string[] }>(
-		'unchangedRegion',
+		this,
 		{ regions: [], originalDecorationIds: [], modifiedDecorationIds: [] }
 	);
-	public readonly unchangedRegions: IObservable<UnchangedRegion[]> = derived(r => {
-		/** @description unchangedRegions */
+	public readonly unchangedRegions: IObservable<UnchangedRegion[]> = derived(this, r => {
 		if (this._options.hideUnchangedRegions.read(r)) {
 			return this._unchangedRegions.read(r).regions;
 		} else {
@@ -47,13 +46,13 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 	}
 	);
 
-	public readonly movedTextToCompare = observableValue<MovedText | undefined>('movedTextToCompare', undefined);
+	public readonly movedTextToCompare = observableValue<MovedText | undefined>(this, undefined);
 
-	private readonly _activeMovedText = observableValue<MovedText | undefined>('activeMovedText', undefined);
-	private readonly _hoveredMovedText = observableValue<MovedText | undefined>('hoveredMovedText', undefined);
+	private readonly _activeMovedText = observableValue<MovedText | undefined>(this, undefined);
+	private readonly _hoveredMovedText = observableValue<MovedText | undefined>(this, undefined);
 
 
-	public readonly activeMovedText = derived(r => this.movedTextToCompare.read(r) ?? this._hoveredMovedText.read(r) ?? this._activeMovedText.read(r));
+	public readonly activeMovedText = derived(this, r => this.movedTextToCompare.read(r) ?? this._hoveredMovedText.read(r) ?? this._activeMovedText.read(r));
 
 	public setActiveMovedText(movedText: MovedText | undefined): void {
 		this._activeMovedText.set(movedText, undefined);
@@ -365,16 +364,16 @@ export class UnchangedRegion {
 		return LineRange.ofLength(this.modifiedLineNumber, this.lineCount);
 	}
 
-	private readonly _visibleLineCountTop = observableValue<number>('visibleLineCountTop', 0);
+	private readonly _visibleLineCountTop = observableValue<number>(this, 0);
 	public readonly visibleLineCountTop: ISettableObservable<number> = this._visibleLineCountTop;
 
-	private readonly _visibleLineCountBottom = observableValue<number>('visibleLineCountBottom', 0);
+	private readonly _visibleLineCountBottom = observableValue<number>(this, 0);
 	public readonly visibleLineCountBottom: ISettableObservable<number> = this._visibleLineCountBottom;
 
-	private readonly _shouldHideControls = derived(reader => /** @description isVisible */
+	private readonly _shouldHideControls = derived(this, reader => /** @description isVisible */
 		this.visibleLineCountTop.read(reader) + this.visibleLineCountBottom.read(reader) === this.lineCount && !this.isDragged.read(reader));
 
-	public readonly isDragged = observableValue<boolean>('isDragged', false);
+	public readonly isDragged = observableValue<boolean>(this, false);
 
 	constructor(
 		public readonly originalLineNumber: number,
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
index 40094652891..bd99533b577 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
@@ -66,13 +66,13 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 	private readonly _rootSizeObserver: ObservableElementSizeObserver;
 
 	private readonly _sash: IObservable<DiffEditorSash | undefined>;
-	private readonly _boundarySashes = observableValue<IBoundarySashes | undefined>('boundarySashes', undefined);
+	private readonly _boundarySashes = observableValue<IBoundarySashes | undefined>(this, undefined);
 
 	private unchangedRangesFeature!: HideUnchangedRegionsFeature;
 
-	private _accessibleDiffViewerShouldBeVisible = observableValue('accessibleDiffViewerShouldBeVisible', false);
-	private _accessibleDiffViewerVisible = derived(reader =>
-		/** @description accessibleDiffViewerVisible */ this._options.onlyShowAccessibleDiffViewer.read(reader)
+	private _accessibleDiffViewerShouldBeVisible = observableValue(this, false);
+	private _accessibleDiffViewerVisible = derived(this, reader =>
+		this._options.onlyShowAccessibleDiffViewer.read(reader)
 			? true
 			: this._accessibleDiffViewerShouldBeVisible.read(reader)
 	);
@@ -80,7 +80,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 	private readonly _options: DiffEditorOptions;
 	private readonly _editors: DiffEditorEditors;
 
-	private readonly movedBlocksLinesPart = observableValue<MovedBlocksLinesPart | undefined>('MovedBlocksLinesPart', undefined);
+	private readonly movedBlocksLinesPart = observableValue<MovedBlocksLinesPart | undefined>(this, undefined);
 
 	public get collapseUnchangedRegions() { return this._options.hideUnchangedRegions.get(); }
 
@@ -136,7 +136,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 			(i, c, o, o2) => this._createInnerEditor(i, c, o, o2)
 		));
 
-		this._sash = derivedWithStore('sash', (reader, store) => {
+		this._sash = derivedWithStore(this, (reader, store) => {
 			const showSash = this._options.renderSideBySide.read(reader);
 			this.elements.root.classList.toggle('side-by-side', showSash);
 			if (!showSash) { return undefined; }
@@ -289,8 +289,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 		return editor;
 	}
 
-	private readonly _layoutInfo = derived(reader => {
-		/** @description modifiedEditorLayoutInfo */
+	private readonly _layoutInfo = derived(this, reader => {
 		const width = this._rootSizeObserver.width.read(reader);
 		const height = this._rootSizeObserver.height.read(reader);
 		const sashLeft = this._sash.read(reader)?.sashLeft.read(reader);
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature.ts b/src/vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature.ts
index 6c7851b9416..5beb8c3ff37 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature.ts
@@ -33,7 +33,7 @@ export class HideUnchangedRegionsFeature extends Disposable {
 	private _isUpdatingViewZones = false;
 	public get isUpdatingViewZones(): boolean { return this._isUpdatingViewZones; }
 
-	private readonly _modifiedOutlineSource = derivedWithStore('modified outline source', (reader, store) => {
+	private readonly _modifiedOutlineSource = derivedWithStore(this, (reader, store) => {
 		const m = this._editors.modifiedModel.read(reader);
 		if (!m) { return undefined; }
 		return store.add(new OutlineSource(this._languageFeaturesService, m));
@@ -73,7 +73,8 @@ export class HideUnchangedRegionsFeature extends Disposable {
 
 		const unchangedRegions = this._diffModel.map((m, reader) => m?.diff.read(reader)?.mappings.length === 0 ? [] : m?.unchangedRegions.read(reader) ?? []);
 
-		const viewZones = derivedWithStore('view zones', (reader, store) => {
+		const viewZones = derivedWithStore(this, (reader, store) => {
+			/** @description view Zones */
 			const modifiedOutlineSource = this._modifiedOutlineSource.read(reader);
 			if (!modifiedOutlineSource) { return { origViewZones: [], modViewZones: [] }; }
 
@@ -210,7 +211,7 @@ export class HideUnchangedRegionsFeature extends Disposable {
 }
 
 class OutlineSource extends Disposable {
-	private readonly _currentModel = observableValue<OutlineModel | undefined>('current model', undefined);
+	private readonly _currentModel = observableValue<OutlineModel | undefined>(this, undefined);
 
 	constructor(
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts b/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts
index 32d34563d46..86514a3a1ad 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts
@@ -39,14 +39,14 @@ import { DiffEditorOptions } from './diffEditorOptions';
  * Synchronizes scrolling.
  */
 export class ViewZoneManager extends Disposable {
-	private readonly _originalTopPadding = observableValue('originalTopPadding', 0);
+	private readonly _originalTopPadding = observableValue(this, 0);
 	private readonly _originalScrollTop: IObservable<number>;
-	private readonly _originalScrollOffset = observableValue<number, boolean>('originalScrollOffset', 0);
+	private readonly _originalScrollOffset = observableValue<number, boolean>(this, 0);
 	private readonly _originalScrollOffsetAnimated = animatedObservable(this._originalScrollOffset, this._store);
 
-	private readonly _modifiedTopPadding = observableValue('modifiedTopPadding', 0);
+	private readonly _modifiedTopPadding = observableValue(this, 0);
 	private readonly _modifiedScrollTop: IObservable<number>;
-	private readonly _modifiedScrollOffset = observableValue<number, boolean>('modifiedScrollOffset', 0);
+	private readonly _modifiedScrollOffset = observableValue<number, boolean>(this, 0);
 	private readonly _modifiedScrollOffsetAnimated = animatedObservable(this._modifiedScrollOffset, this._store);
 
 	constructor(
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts b/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts
index 8a618685996..1cb8f2d27ca 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts
@@ -29,7 +29,7 @@ export class MovedBlocksLinesPart extends Disposable {
 	private readonly _modifiedScrollTop = observableFromEvent(this._editors.modified.onDidScrollChange, () => this._editors.modified.getScrollTop());
 	private readonly _viewZonesChanged = observableSignalFromEvent('onDidChangeViewZones', this._editors.modified.onDidChangeViewZones);
 
-	public readonly width = observableValue('width', 0);
+	public readonly width = observableValue(this, 0);
 
 	constructor(
 		private readonly _rootElement: HTMLElement,
@@ -136,8 +136,8 @@ export class MovedBlocksLinesPart extends Disposable {
 	private readonly _modifiedViewZonesChangedSignal = observableSignalFromEvent('modified.onDidChangeViewZones', this._editors.modified.onDidChangeViewZones);
 	private readonly _originalViewZonesChangedSignal = observableSignalFromEvent('original.onDidChangeViewZones', this._editors.original.onDidChangeViewZones);
 
-	private readonly _state = derivedWithStore('state', (reader, store) => {
-		/** @description update moved blocks lines */
+	private readonly _state = derivedWithStore((reader, store) => {
+		/** @description state */
 
 		this._element.replaceChildren();
 		const model = this._diffModel.read(reader);
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts b/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts
index 407fbbbb84c..352ff672edc 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/utils.ts
@@ -57,7 +57,7 @@ export function joinCombine<T>(arr1: readonly T[], arr2: readonly T[], keySelect
 export function applyObservableDecorations(editor: ICodeEditor, decorations: IObservable<IModelDeltaDecoration[]>): IDisposable {
 	const d = new DisposableStore();
 	const decorationsCollection = editor.createDecorationsCollection();
-	d.add(autorunOpts({ debugName: `Apply decorations from ${decorations.debugName}` }, reader => {
+	d.add(autorunOpts({ debugName: () => `Apply decorations from ${decorations.debugName}` }, reader => {
 		const d = decorations.read(reader);
 		decorationsCollection.set(d);
 	}));
@@ -100,8 +100,8 @@ export class ObservableElementSizeObserver extends Disposable {
 		super();
 
 		this.elementSizeObserver = this._register(new ElementSizeObserver(element, dimension));
-		this._width = observableValue('width', this.elementSizeObserver.getWidth());
-		this._height = observableValue('height', this.elementSizeObserver.getHeight());
+		this._width = observableValue(this, this.elementSizeObserver.getWidth());
+		this._height = observableValue(this, this.elementSizeObserver.getHeight());
 
 		this._register(this.elementSizeObserver.onDidChange(e => transaction(tx => {
 			/** @description Set width/height from elementSizeObserver */
@@ -214,8 +214,8 @@ export interface IObservableViewZone extends IViewZone {
 export class PlaceholderViewZone implements IObservableViewZone {
 	public readonly domNode = document.createElement('div');
 
-	private readonly _actualTop = observableValue<number | undefined>('actualTop', undefined);
-	private readonly _actualHeight = observableValue<number | undefined>('actualHeight', undefined);
+	private readonly _actualTop = observableValue<number | undefined>(this, undefined);
+	private readonly _actualHeight = observableValue<number | undefined>(this, undefined);
 
 	public readonly actualTop: IObservable<number | undefined> = this._actualTop;
 	public readonly actualHeight: IObservable<number | undefined> = this._actualHeight;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts b/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts
index a43c994c249..0f7a28ca902 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts
@@ -32,7 +32,7 @@ export interface IGhostTextWidgetModel {
 }
 
 export class GhostTextWidget extends Disposable {
-	private readonly isDisposed = observableValue('isDisposed', false);
+	private readonly isDisposed = observableValue(this, false);
 	private readonly currentTextModel = observableFromEvent(this.editor.onDidChangeModel, () => this.editor.getModel());
 
 	constructor(
@@ -46,8 +46,7 @@ export class GhostTextWidget extends Disposable {
 		this._register(applyObservableDecorations(this.editor, this.decorations));
 	}
 
-	private readonly uiState = derived(reader => {
-		/** @description uiState */
+	private readonly uiState = derived(this, reader => {
 		if (this.isDisposed.read(reader)) {
 			return undefined;
 		}
@@ -126,8 +125,7 @@ export class GhostTextWidget extends Disposable {
 		};
 	});
 
-	private readonly decorations = derived(reader => {
-		/** @description decorations */
+	private readonly decorations = derived(this, reader => {
 		const uiState = this.uiState.read(reader);
 		if (!uiState) {
 			return [];
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts
index 094393e32c5..47e54284538 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts
@@ -38,8 +38,8 @@ export class InlineCompletionsController extends Disposable {
 	}
 
 	public readonly model = disposableObservableValue<InlineCompletionsModel | undefined>('inlineCompletionModel', undefined);
-	private readonly textModelVersionId = observableValue<number, VersionIdChangeReason>('textModelVersionId', -1);
-	private readonly cursorPosition = observableValue<Position>('cursorPosition', new Position(1, 1));
+	private readonly textModelVersionId = observableValue<number, VersionIdChangeReason>(this, -1);
+	private readonly cursorPosition = observableValue<Position>(this, new Position(1, 1));
 	private readonly suggestWidgetAdaptor = this._register(new SuggestWidgetAdaptor(
 		this.editor,
 		() => this.model.get()?.selectedInlineCompletion.get()?.toSingleTextEdit(undefined),
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts
index 0cde6e9a9b5..161d7cc4416 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts
@@ -39,8 +39,7 @@ export class InlineCompletionsHintsWidget extends Disposable {
 
 	private sessionPosition: Position | undefined = undefined;
 
-	private readonly position = derived(reader => {
-		/** @description position */
+	private readonly position = derived(this, reader => {
 		const ghostText = this.model.read(reader)?.ghostText.read(reader);
 
 		if (!this.alwaysShowToolbar.read(reader) || !ghostText || ghostText.parts.length === 0) {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
index 252f9ca5f9f..b67a29ea576 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
@@ -34,11 +34,11 @@ export enum VersionIdChangeReason {
 
 export class InlineCompletionsModel extends Disposable {
 	private readonly _source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this.textModelVersionId, this._debounceValue));
-	private readonly _isActive = observableValue<boolean, InlineCompletionTriggerKind | void>('isActive', false);
+	private readonly _isActive = observableValue<boolean, InlineCompletionTriggerKind | void>(this, false);
 	private readonly _forceUpdate = observableSignal<InlineCompletionTriggerKind>('forceUpdate');
 
 	// We use a semantic id to keep the same inline completion selected even if the provider reorders the completions.
-	private readonly _selectedInlineCompletionId = observableValue<string | undefined>('selectedInlineCompletionId', undefined);
+	private readonly _selectedInlineCompletionId = observableValue<string | undefined>(this, undefined);
 
 	private _isAcceptingPartially = false;
 	public get isAcceptingPartially() { return this._isAcceptingPartially; }
@@ -82,12 +82,14 @@ export class InlineCompletionsModel extends Disposable {
 		VersionIdChangeReason.Undo,
 		VersionIdChangeReason.AcceptWord,
 	]);
-	private readonly _fetchInlineCompletions = derivedHandleChanges('fetch inline completions', {
+	private readonly _fetchInlineCompletions = derivedHandleChanges({
+		owner: this,
 		createEmptyChangeSummary: () => ({
 			preserveCurrentCompletion: false,
 			inlineCompletionTriggerKind: InlineCompletionTriggerKind.Automatic
 		}),
 		handleChange: (ctx, changeSummary) => {
+			/** @description fetch inline completions */
 			if (ctx.didChange(this.textModelVersionId) && this._preserveCurrentCompletionReasons.has(ctx.change)) {
 				changeSummary.preserveCurrentCompletion = true;
 			} else if (ctx.didChange(this._forceUpdate)) {
@@ -150,8 +152,7 @@ export class InlineCompletionsModel extends Disposable {
 		});
 	}
 
-	private readonly _filteredInlineCompletionItems = derived(reader => {
-		/** @description _filteredInlineCompletionItems */
+	private readonly _filteredInlineCompletionItems = derived(this, reader => {
 		const c = this._source.inlineCompletions.read(reader);
 		if (!c) { return []; }
 		const cursorPosition = this.cursorPosition.read(reader);
@@ -159,8 +160,7 @@ export class InlineCompletionsModel extends Disposable {
 		return filteredCompletions;
 	});
 
-	public readonly selectedInlineCompletionIndex = derived<number>((reader) => {
-		/** @description selectedInlineCompletionIndex */
+	public readonly selectedInlineCompletionIndex = derived<number>(this, (reader) => {
 		const selectedInlineCompletionId = this._selectedInlineCompletionId.read(reader);
 		const filteredCompletions = this._filteredInlineCompletionItems.read(reader);
 		const idx = this._selectedInlineCompletionId === undefined ? -1
@@ -173,8 +173,7 @@ export class InlineCompletionsModel extends Disposable {
 		return idx;
 	});
 
-	public readonly selectedInlineCompletion = derived<InlineCompletionWithUpdatedRange | undefined>((reader) => {
-		/** @description selectedCachedCompletion */
+	public readonly selectedInlineCompletion = derived<InlineCompletionWithUpdatedRange | undefined>(this, (reader) => {
 		const filteredCompletions = this._filteredInlineCompletionItems.read(reader);
 		const idx = this.selectedInlineCompletionIndex.read(reader);
 		return filteredCompletions[idx];
@@ -184,8 +183,7 @@ export class InlineCompletionsModel extends Disposable {
 		v => /** @description lastTriggerKind */ v?.request.context.triggerKind
 	);
 
-	public readonly inlineCompletionsCount = derived<number | undefined>(reader => {
-		/** @description inlineCompletionsCount */
+	public readonly inlineCompletionsCount = derived<number | undefined>(this, reader => {
 		if (this.lastTriggerKind.read(reader) === InlineCompletionTriggerKind.Explicit) {
 			return this._filteredInlineCompletionItems.read(reader).length;
 		} else {
@@ -198,6 +196,7 @@ export class InlineCompletionsModel extends Disposable {
 		inlineCompletion: InlineCompletionWithUpdatedRange | undefined;
 		ghostText: GhostTextOrReplacement;
 	} | undefined>({
+		owner: this,
 		equalityComparer: (a, b) => {
 			if (!a || !b) { return a === b; }
 			return ghostTextOrReplacementEquals(a.ghostText, b.ghostText)
@@ -205,7 +204,6 @@ export class InlineCompletionsModel extends Disposable {
 				&& a.suggestItem === b.suggestItem;
 		}
 	}, (reader) => {
-		/** @description ghostTextAndCompletion */
 		const model = this.textModel;
 
 		const suggestItem = this.selectedSuggestItem.read(reader);
@@ -256,9 +254,9 @@ export class InlineCompletionsModel extends Disposable {
 	}
 
 	public readonly ghostText = derivedOpts({
+		owner: this,
 		equalityComparer: ghostTextOrReplacementEquals
 	}, reader => {
-		/** @description ghostText */
 		const v = this.state.read(reader);
 		if (!v) { return undefined; }
 		return v.ghostText;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts
index 14a7cdf1f44..99f8e5d776c 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts
@@ -183,8 +183,7 @@ export class UpToDateInlineCompletions implements IDisposable {
 	private readonly _prependedInlineCompletionItems: InlineCompletionItem[] = [];
 
 	private _rangeVersionIdValue = 0;
-	private readonly _rangeVersionId = derived(reader => {
-		/** @description ranges */
+	private readonly _rangeVersionId = derived(this, reader => {
 		this.versionId.read(reader);
 		let changed = false;
 		for (const i of this._inlineCompletions) {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts b/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
index 7c26816b473..24c90dbdb52 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
@@ -24,7 +24,7 @@ export class SuggestWidgetAdaptor extends Disposable {
 	private _isActive = false;
 	private _currentSuggestItemInfo: SuggestItemInfo | undefined = undefined;
 
-	private readonly _selectedItem = observableValue('suggestWidgetInlineCompletionProvider.selectedItem', undefined as SuggestItemInfo | undefined);
+	private readonly _selectedItem = observableValue(this, undefined as SuggestItemInfo | undefined);
 
 	public get selectedItem(): IObservable<SuggestItemInfo | undefined> {
 		return this._selectedItem;
diff --git a/src/vs/workbench/contrib/debug/common/debugStorage.ts b/src/vs/workbench/contrib/debug/common/debugStorage.ts
index 1f11c827a16..efcd601c246 100644
--- a/src/vs/workbench/contrib/debug/common/debugStorage.ts
+++ b/src/vs/workbench/contrib/debug/common/debugStorage.ts
@@ -22,11 +22,11 @@ const DEBUG_CHOSEN_ENVIRONMENTS_KEY = 'debug.chosenenvironment';
 const DEBUG_UX_STATE_KEY = 'debug.uxstate';
 
 export class DebugStorage extends Disposable {
-	public readonly breakpoints = observableValue('debugBreakpoints', this.loadBreakpoints());
-	public readonly functionBreakpoints = observableValue('debugFunctionBreakpoints', this.loadFunctionBreakpoints());
-	public readonly exceptionBreakpoints = observableValue('debugExceptionBreakpoints', this.loadExceptionBreakpoints());
-	public readonly dataBreakpoints = observableValue('debugDataBreakpoints', this.loadDataBreakpoints());
-	public readonly watchExpressions = observableValue('debugWatchExpressions', this.loadWatchExpressions());
+	public readonly breakpoints = observableValue(this, this.loadBreakpoints());
+	public readonly functionBreakpoints = observableValue(this, this.loadFunctionBreakpoints());
+	public readonly exceptionBreakpoints = observableValue(this, this.loadExceptionBreakpoints());
+	public readonly dataBreakpoints = observableValue(this, this.loadDataBreakpoints());
+	public readonly watchExpressions = observableValue(this, this.loadWatchExpressions());
 
 	constructor(
 		@IStorageService private readonly storageService: IStorageService,
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
index 27d6357c6c5..cbf245b78ff 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
@@ -126,16 +126,14 @@ export class TempFileMergeEditorModeFactory implements IMergeEditorInputModelFac
 }
 
 class TempFileMergeEditorInputModel extends EditorModel implements IMergeEditorInputModel {
-	private readonly savedAltVersionId = observableValue('initialAltVersionId', this.model.resultTextModel.getAlternativeVersionId());
+	private readonly savedAltVersionId = observableValue(this, this.model.resultTextModel.getAlternativeVersionId());
 	private readonly altVersionId = observableFromEvent(
 		e => this.model.resultTextModel.onDidChangeContent(e),
 		() =>
 			/** @description getAlternativeVersionId */ this.model.resultTextModel.getAlternativeVersionId()
 	);
 
-	public readonly isDirty = derived(
-		(reader) => /** @description isDirty */ this.altVersionId.read(reader) !== this.savedAltVersionId.read(reader)
-	);
+	public readonly isDirty = derived(this, (reader) => this.altVersionId.read(reader) !== this.savedAltVersionId.read(reader));
 
 	private finished = false;
 
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
index 9ea7de40bd7..f1e508e57a7 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
@@ -32,23 +32,20 @@ export class MergeEditorModel extends EditorModel {
 	private readonly input1TextModelDiffs = this._register(new TextModelDiffs(this.base, this.input1.textModel, this.diffComputer));
 	private readonly input2TextModelDiffs = this._register(new TextModelDiffs(this.base, this.input2.textModel, this.diffComputer));
 	private readonly resultTextModelDiffs = this._register(new TextModelDiffs(this.base, this.resultTextModel, this.diffComputer));
-	public readonly modifiedBaseRanges = derived<ModifiedBaseRange[]>((reader) => {
-		/** @description modifiedBaseRanges */
+	public readonly modifiedBaseRanges = derived<ModifiedBaseRange[]>(this, (reader) => {
 		const input1Diffs = this.input1TextModelDiffs.diffs.read(reader);
 		const input2Diffs = this.input2TextModelDiffs.diffs.read(reader);
 		return ModifiedBaseRange.fromDiffs(input1Diffs, input2Diffs, this.base, this.input1.textModel, this.input2.textModel);
 	});
 
-	private readonly modifiedBaseRangeResultStates =
-		derived(reader => {
-			/** @description modifiedBaseRangeResultStates */
-			const map = new Map<ModifiedBaseRange, ModifiedBaseRangeData>(
-				this.modifiedBaseRanges.read(reader).map<[ModifiedBaseRange, ModifiedBaseRangeData]>((s) => [
-					s, new ModifiedBaseRangeData(s)
-				])
-			);
-			return map;
-		});
+	private readonly modifiedBaseRangeResultStates = derived(this, reader => {
+		const map = new Map<ModifiedBaseRange, ModifiedBaseRangeData>(
+			this.modifiedBaseRanges.read(reader).map<[ModifiedBaseRange, ModifiedBaseRangeData]>((s) => [
+				s, new ModifiedBaseRangeData(s)
+			])
+		);
+		return map;
+	});
 
 	private readonly resultSnapshot = this.resultTextModel.createSnapshot();
 
@@ -207,8 +204,7 @@ export class MergeEditorModel extends EditorModel {
 	public readonly baseInput2Diffs = this.input2TextModelDiffs.diffs;
 	public readonly baseResultDiffs = this.resultTextModelDiffs.diffs;
 	public get isApplyingEditInResult(): boolean { return this.resultTextModelDiffs.isApplyingChange; }
-	public readonly input1ResultMapping = derived(reader => {
-		/** @description input1ResultMapping */
+	public readonly input1ResultMapping = derived(this, reader => {
 		return this.getInputResultMapping(
 			this.baseInput1Diffs.read(reader),
 			this.baseResultDiffs.read(reader),
@@ -216,10 +212,9 @@ export class MergeEditorModel extends EditorModel {
 		);
 	});
 
-	public readonly resultInput1Mapping = derived(reader => /** @description resultInput1Mapping */ this.input1ResultMapping.read(reader).reverse());
+	public readonly resultInput1Mapping = derived(this, reader => this.input1ResultMapping.read(reader).reverse());
 
-	public readonly input2ResultMapping = derived(reader => {
-		/** @description input2ResultMapping */
+	public readonly input2ResultMapping = derived(this, reader => {
 		return this.getInputResultMapping(
 			this.baseInput2Diffs.read(reader),
 			this.baseResultDiffs.read(reader),
@@ -227,7 +222,7 @@ export class MergeEditorModel extends EditorModel {
 		);
 	});
 
-	public readonly resultInput2Mapping = derived(reader => /** @description resultInput2Mapping */ this.input2ResultMapping.read(reader).reverse());
+	public readonly resultInput2Mapping = derived(this, reader => this.input2ResultMapping.read(reader).reverse());
 
 	private getInputResultMapping(inputLinesDiffs: DetailedLineRangeMapping[], resultDiffs: DetailedLineRangeMapping[], inputLineCount: number) {
 		const map = DocumentLineRangeMap.betweenOutputs(inputLinesDiffs, resultDiffs, inputLineCount);
@@ -245,8 +240,7 @@ export class MergeEditorModel extends EditorModel {
 		);
 	}
 
-	public readonly baseResultMapping = derived(reader => {
-		/** @description baseResultMapping */
+	public readonly baseResultMapping = derived(this, reader => {
 		const map = new DocumentLineRangeMap(this.baseResultDiffs.read(reader), -1);
 		return new DocumentLineRangeMap(
 			map.lineRangeMappings.map((m) =>
@@ -262,7 +256,7 @@ export class MergeEditorModel extends EditorModel {
 		);
 	});
 
-	public readonly resultBaseMapping = derived(reader => /** @description resultBaseMapping */ this.baseResultMapping.read(reader).reverse());
+	public readonly resultBaseMapping = derived(this, reader => this.baseResultMapping.read(reader).reverse());
 
 	public translateInputRangeToBase(input: 1 | 2, range: Range): Range {
 		const baseInputDiffs = input === 1 ? this.baseInput1Diffs.get() : this.baseInput2Diffs.get();
@@ -295,8 +289,7 @@ export class MergeEditorModel extends EditorModel {
 		return this.modifiedBaseRanges.get().filter(r => r.baseRange.intersects(rangeInBase));
 	}
 
-	public readonly diffComputingState = derived(reader => {
-		/** @description diffComputingState */
+	public readonly diffComputingState = derived(this, reader => {
 		const states = [
 			this.input1TextModelDiffs,
 			this.input2TextModelDiffs,
@@ -312,8 +305,7 @@ export class MergeEditorModel extends EditorModel {
 		return MergeEditorModelState.upToDate;
 	});
 
-	public readonly inputDiffComputingState = derived(reader => {
-		/** @description inputDiffComputingState */
+	public readonly inputDiffComputingState = derived(this, reader => {
 		const states = [
 			this.input1TextModelDiffs,
 			this.input2TextModelDiffs,
@@ -328,7 +320,7 @@ export class MergeEditorModel extends EditorModel {
 		return MergeEditorModelState.upToDate;
 	});
 
-	public readonly isUpToDate = derived(reader => /** @description isUpToDate */ this.diffComputingState.read(reader) === MergeEditorModelState.upToDate);
+	public readonly isUpToDate = derived(this, reader => this.diffComputingState.read(reader) === MergeEditorModelState.upToDate);
 
 	public readonly onInitialized = waitForState(this.diffComputingState, state => state === MergeEditorModelState.upToDate).then(() => { });
 
@@ -548,7 +540,7 @@ export class MergeEditorModel extends EditorModel {
 		state.handledInput2.set(handled, tx);
 	}
 
-	public readonly unhandledConflictsCount = derived(reader => /** @description unhandledConflictsCount */ {
+	public readonly unhandledConflictsCount = derived(this, reader => {
 		const map = this.modifiedBaseRangeResultStates.read(reader);
 		let unhandledCount = 0;
 		for (const [_key, value] of map) {
@@ -772,7 +764,7 @@ class ModifiedBaseRangeData {
 	public computedFromDiffing = false;
 	public previousNonDiffingState: ModifiedBaseRangeState | undefined = undefined;
 
-	public readonly handled = derived(reader => /** @description handled */ this.handledInput1.read(reader) && this.handledInput2.read(reader));
+	public readonly handled = derived(this, reader => this.handledInput1.read(reader) && this.handledInput2.read(reader));
 }
 
 export const enum MergeEditorModelState {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
index 2c1b5a2cca6..663973ff4af 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
@@ -17,8 +17,8 @@ import { UndoRedoGroup } from 'vs/platform/undoRedo/common/undoRedo';
 
 export class TextModelDiffs extends Disposable {
 	private recomputeCount = 0;
-	private readonly _state = observableValue<TextModelDiffState, TextModelDiffChangeReason>('LiveDiffState', TextModelDiffState.initializing);
-	private readonly _diffs = observableValue<DetailedLineRangeMapping[], TextModelDiffChangeReason>('LiveDiffs', []);
+	private readonly _state = observableValue<TextModelDiffState, TextModelDiffChangeReason>(this, TextModelDiffState.initializing);
+	private readonly _diffs = observableValue<DetailedLineRangeMapping[], TextModelDiffChangeReason>(this, []);
 
 	private readonly barrier = new ReentrancyBarrier();
 	private isDisposed = false;
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
index 4e9364631b5..69b4fac15a9 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
@@ -211,8 +211,7 @@ export class ActionsSource {
 	public readonly itemsInput1 = this.getItemsInput(1);
 	public readonly itemsInput2 = this.getItemsInput(2);
 
-	public readonly resultItems = derived(reader => {
-		/** @description resultItems */
+	public readonly resultItems = derived(this, reader => {
 		const viewModel = this.viewModel;
 		const modifiedBaseRange = this.modifiedBaseRange;
 
@@ -321,13 +320,11 @@ export class ActionsSource {
 		return result;
 	});
 
-	public readonly isEmpty = derived(reader => {
-		/** @description isEmpty */
+	public readonly isEmpty = derived(this, reader => {
 		return this.itemsInput1.read(reader).length + this.itemsInput2.read(reader).length + this.resultItems.read(reader).length === 0;
 	});
 
-	public readonly inputIsEmpty = derived(reader => {
-		/** @description inputIsEmpty */
+	public readonly inputIsEmpty = derived(this, reader => {
 		return this.itemsInput1.read(reader).length + this.itemsInput2.read(reader).length === 0;
 	});
 }
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.ts
index aa89a47e9ce..c55a657f0d4 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.ts
@@ -71,8 +71,7 @@ export class BaseCodeEditorView extends CodeEditorView {
 		this._register(applyObservableDecorations(this.editor, this.decorations));
 	}
 
-	private readonly decorations = derived(reader => {
-		/** @description base.decorations */
+	private readonly decorations = derived(this, reader => {
 		const viewModel = this.viewModel.read(reader);
 		if (!viewModel) {
 			return [];
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts
index 0dbe1913d84..03cffeea7d1 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts
@@ -227,8 +227,7 @@ export class ModifiedBaseRangeGutterItemModel implements IGutterItemInfo {
 
 	public readonly enabled = this.model.isUpToDate;
 
-	public readonly toggleState: IObservable<InputState> = derived(reader => {
-		/** @description checkbox is checked */
+	public readonly toggleState: IObservable<InputState> = derived(this, reader => {
 		const input = this.model
 			.getState(this.baseRange)
 			.read(reader)
@@ -238,8 +237,7 @@ export class ModifiedBaseRangeGutterItemModel implements IGutterItemInfo {
 			: input;
 	});
 
-	public readonly state: IObservable<{ handled: boolean; focused: boolean }> = derived(reader => {
-		/** @description checkbox state */
+	public readonly state: IObservable<{ handled: boolean; focused: boolean }> = derived(this, reader => {
 		const active = this.viewModel.activeModifiedBaseRange.read(reader);
 		if (!this.model.hasBaseRange(this.baseRange)) {
 			return { handled: false, focused: false }; // Invalid state, should only be observed temporarily
@@ -365,7 +363,7 @@ export class MergeConflictGutterItemView extends Disposable implements IGutterIt
 	private readonly item: ISettableObservable<ModifiedBaseRangeGutterItemModel>;
 
 	private readonly checkboxDiv: HTMLDivElement;
-	private readonly isMultiLine = observableValue('isMultiLine', false);
+	private readonly isMultiLine = observableValue(this, false);
 
 	constructor(
 		item: ModifiedBaseRangeGutterItemModel,
@@ -374,7 +372,7 @@ export class MergeConflictGutterItemView extends Disposable implements IGutterIt
 	) {
 		super();
 
-		this.item = observableValue('item', item);
+		this.item = observableValue(this, item);
 
 		const checkBox = new Toggle({
 			isChecked: false,
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.ts
index 1fdd3cf1761..54c7d9745b8 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.ts
@@ -129,8 +129,7 @@ export class ResultCodeEditorView extends CodeEditorView {
 		);
 	}
 
-	private readonly decorations = derived(reader => {
-		/** @description result.decorations */
+	private readonly decorations = derived(this, reader => {
 		const viewModel = this.viewModel.read(reader);
 		if (!viewModel) {
 			return [];
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
index 09657513a16..6521589e940 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
@@ -58,7 +58,7 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 	static readonly ID = 'mergeEditor';
 
 	private readonly _sessionDisposables = new DisposableStore();
-	private readonly _viewModel = observableValue<MergeEditorViewModel | undefined>('viewModel', undefined);
+	private readonly _viewModel = observableValue<MergeEditorViewModel | undefined>(this, undefined);
 
 	public get viewModel(): IObservable<MergeEditorViewModel | undefined> {
 		return this._viewModel;
@@ -67,13 +67,13 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 	private rootHtmlElement: HTMLElement | undefined;
 	private readonly _grid = this._register(new MutableDisposable<Grid<IView>>());
 	private readonly input1View = this._register(this.instantiationService.createInstance(InputCodeEditorView, 1, this._viewModel));
-	private readonly baseView = observableValue<BaseCodeEditorView | undefined>('baseView', undefined);
-	private readonly baseViewOptions = observableValue<Readonly<ICodeEditorOptions> | undefined>('baseViewOptions', undefined);
+	private readonly baseView = observableValue<BaseCodeEditorView | undefined>(this, undefined);
+	private readonly baseViewOptions = observableValue<Readonly<ICodeEditorOptions> | undefined>(this, undefined);
 	private readonly input2View = this._register(this.instantiationService.createInstance(InputCodeEditorView, 2, this._viewModel));
 
 	private readonly inputResultView = this._register(this.instantiationService.createInstance(ResultCodeEditorView, this._viewModel));
 	private readonly _layoutMode = this.instantiationService.createInstance(MergeEditorLayoutStore);
-	private readonly _layoutModeObs = observableValue('layoutMode', this._layoutMode.value);
+	private readonly _layoutModeObs = observableValue(this, this._layoutMode.value);
 	private readonly _ctxIsMergeEditor: IContextKey<boolean> = ctxIsMergeEditor.bindTo(this.contextKeyService);
 	private readonly _ctxUsesColumnLayout: IContextKey<string> = ctxMergeEditorLayout.bindTo(this.contextKeyService);
 	private readonly _ctxShowBase: IContextKey<boolean> = ctxMergeEditorShowBase.bindTo(this.contextKeyService);
@@ -81,7 +81,7 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 	private readonly _ctxResultUri: IContextKey<string> = ctxMergeResultUri.bindTo(this.contextKeyService);
 	private readonly _ctxBaseUri: IContextKey<string> = ctxMergeBaseUri.bindTo(this.contextKeyService);
 	private readonly _ctxShowNonConflictingChanges: IContextKey<boolean> = ctxMergeEditorShowNonConflictingChanges.bindTo(this.contextKeyService);
-	private readonly _inputModel = observableValue<IMergeEditorInputModel | undefined>('inputModel', undefined);
+	private readonly _inputModel = observableValue<IMergeEditorInputModel | undefined>(this, undefined);
 	public get inputModel(): IObservable<IMergeEditorInputModel | undefined> {
 		return this._inputModel;
 	}
@@ -665,7 +665,7 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 	}
 
 	private readonly showNonConflictingChangesStore = this.instantiationService.createInstance(PersistentStore<boolean>, 'mergeEditor/showNonConflictingChanges');
-	private readonly showNonConflictingChanges = observableValue('showNonConflictingChanges', this.showNonConflictingChangesStore.get() ?? false);
+	private readonly showNonConflictingChanges = observableValue(this, this.showNonConflictingChangesStore.get() ?? false);
 
 	public toggleShowNonConflictingChanges(): void {
 		this.showNonConflictingChanges.set(!this.showNonConflictingChanges.get(), undefined);
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
index 54934eb6ffd..36b94d8490b 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
@@ -24,7 +24,7 @@ import { ResultCodeEditorView } from 'vs/workbench/contrib/mergeEditor/browser/v
 export class MergeEditorViewModel extends Disposable {
 	private readonly manuallySetActiveModifiedBaseRange = observableValue<
 		{ range: ModifiedBaseRange | undefined; counter: number }
-	>('manuallySetActiveModifiedBaseRange', { range: undefined, counter: 0 });
+	>(this, { range: undefined, counter: 0 });
 
 	private readonly attachedHistory = this._register(new AttachedHistory(this.model.resultTextModel));
 
@@ -95,7 +95,7 @@ export class MergeEditorViewModel extends Disposable {
 	private counter = 0;
 	private readonly lastFocusedEditor = derivedObservableWithWritableCache<
 		{ view: CodeEditorView | undefined; counter: number }
-	>('lastFocusedEditor', (reader, lastValue) => {
+	>(this, (reader, lastValue) => {
 		const editors = [
 			this.inputCodeEditorView1,
 			this.inputCodeEditorView2,
@@ -106,8 +106,7 @@ export class MergeEditorViewModel extends Disposable {
 		return view ? { view, counter: this.counter++ } : lastValue || { view: undefined, counter: this.counter++ };
 	});
 
-	public readonly baseShowDiffAgainst = derived<1 | 2 | undefined>(reader => {
-		/** @description baseShowDiffAgainst */
+	public readonly baseShowDiffAgainst = derived<1 | 2 | undefined>(this, reader => {
 		const lastFocusedEditor = this.lastFocusedEditor.read(reader);
 		if (lastFocusedEditor.view === this.inputCodeEditorView1) {
 			return 1;
@@ -117,8 +116,7 @@ export class MergeEditorViewModel extends Disposable {
 		return undefined;
 	});
 
-	public readonly selectionInBase = derived(reader => {
-		/** @description selectionInBase */
+	public readonly selectionInBase = derived(this, reader => {
 		const sourceEditor = this.lastFocusedEditor.read(reader).view;
 		if (!sourceEditor) {
 			return undefined;
@@ -156,7 +154,7 @@ export class MergeEditorViewModel extends Disposable {
 		}
 	}
 
-	public readonly activeModifiedBaseRange = derived(
+	public readonly activeModifiedBaseRange = derived(this,
 		(reader) => {
 			/** @description activeModifiedBaseRange */
 			const focusedEditor = this.lastFocusedEditor.read(reader);
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts
index a7c586b2442..bc98f7239ce 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts
@@ -29,7 +29,7 @@ export interface TextMateModelTokenizerHost {
 export class TextMateWorkerTokenizer extends MirrorTextModel {
 	private _tokenizerWithStateStore: TokenizerWithStateStore<StateStack> | null = null;
 	private _isDisposed: boolean = false;
-	private readonly _maxTokenizationLineLength = observableValue('_maxTokenizationLineLength', -1);
+	private readonly _maxTokenizationLineLength = observableValue(this, -1);
 	private _diffStateStacksRefEqFn?: typeof diffStateStacksRefEq;
 	private readonly _tokenizeDebouncer = new RunOnceScheduler(() => this._tokenize(), 10);
 

From 976b2d6532acc748de17a7cfa4f9d4e853a183bd Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 4 Sep 2023 14:57:47 +0200
Subject: [PATCH 62/94] fix #192115 (#192134)

---
 .../contrib/logs/common/logs.contribution.ts  | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/contrib/logs/common/logs.contribution.ts b/src/vs/workbench/contrib/logs/common/logs.contribution.ts
index d82da53c453..59581610f9b 100644
--- a/src/vs/workbench/contrib/logs/common/logs.contribution.ts
+++ b/src/vs/workbench/contrib/logs/common/logs.contribution.ts
@@ -11,7 +11,7 @@ import { SetLogLevelAction } from 'vs/workbench/contrib/logs/common/logsActions'
 import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { IFileService, whenProviderRegistered } from 'vs/platform/files/common/files';
 import { IOutputChannelRegistry, IOutputService, Extensions } from 'vs/workbench/services/output/common/output';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 import { CONTEXT_LOG_LEVEL, ILogService, ILoggerResource, ILoggerService, LogLevel, LogLevelToString, isLogLevel } from 'vs/platform/log/common/log';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -58,6 +58,7 @@ class LogOutputChannels extends Disposable implements IWorkbenchContribution {
 
 	private readonly contextKeys = new CounterSet<string>();
 	private readonly outputChannelRegistry = Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels);
+	private readonly loggerDisposables = this._register(new DisposableMap());
 
 	constructor(
 		@ILogService private readonly logService: ILogService,
@@ -86,7 +87,7 @@ class LogOutputChannels extends Disposable implements IWorkbenchContribution {
 				if (visibility) {
 					this.registerLogChannel(logger);
 				} else {
-					this.outputChannelRegistry.removeChannel(logger.id);
+					this.deregisterLogChannel(logger);
 				}
 			}
 		}));
@@ -120,7 +121,7 @@ class LogOutputChannels extends Disposable implements IWorkbenchContribution {
 				if (this.contextKeyService.contextMatchesRules(ContextKeyExpr.deserialize(logger.when))) {
 					this.registerLogChannel(logger);
 				} else {
-					this.outputChannelRegistry.removeChannel(logger.id);
+					this.deregisterLogChannel(logger);
 				}
 			}
 		}
@@ -136,7 +137,7 @@ class LogOutputChannels extends Disposable implements IWorkbenchContribution {
 					}
 				}
 			}
-			this.outputChannelRegistry.removeChannel(logger.id);
+			this.deregisterLogChannel(logger);
 		}
 	}
 
@@ -145,27 +146,36 @@ class LogOutputChannels extends Disposable implements IWorkbenchContribution {
 		if (channel && this.uriIdentityService.extUri.isEqual(channel.file, logger.resource)) {
 			return;
 		}
+		const disposables = new DisposableStore();
 		const promise = createCancelablePromise(async token => {
 			await whenProviderRegistered(logger.resource, this.fileService);
 			try {
 				await this.whenFileExists(logger.resource, 1, token);
-				const channel = this.outputChannelRegistry.getChannel(logger.id);
-				if (channel?.file?.scheme === Schemas.vscodeRemote) {
-					// Re-register the channel with new id and name
-					this.outputChannelRegistry.removeChannel(channel.id);
-					this.outputChannelRegistry.registerChannel({ id: `${channel.id}.remote`, label: nls.localize('remote name', "{0} (Remote)", channel.label), file: channel.file, log: channel.log, extensionId: channel.extensionId });
+				const existingChannel = this.outputChannelRegistry.getChannel(logger.id);
+				const remoteLogger = existingChannel?.file?.scheme === Schemas.vscodeRemote ? this.loggerService.getRegisteredLogger(existingChannel.file) : undefined;
+				if (remoteLogger) {
+					this.deregisterLogChannel(remoteLogger);
 				}
-				const hasToAppendRemote = channel && logger.resource.scheme === Schemas.vscodeRemote;
+				const hasToAppendRemote = existingChannel && logger.resource.scheme === Schemas.vscodeRemote;
 				const id = hasToAppendRemote ? `${logger.id}.remote` : logger.id;
 				const label = hasToAppendRemote ? nls.localize('remote name', "{0} (Remote)", logger.name ?? logger.id) : logger.name ?? logger.id;
 				this.outputChannelRegistry.registerChannel({ id, label, file: logger.resource, log: true, extensionId: logger.extensionId });
+				disposables.add(toDisposable(() => this.outputChannelRegistry.removeChannel(id)));
+				if (remoteLogger) {
+					this.registerLogChannel(remoteLogger);
+				}
 			} catch (error) {
 				if (!isCancellationError(error)) {
 					this.logService.error('Error while registering log channel', logger.resource.toString(), getErrorMessage(error));
 				}
 			}
 		});
-		this._register(toDisposable(() => promise.cancel()));
+		disposables.add(toDisposable(() => promise.cancel()));
+		this.loggerDisposables.set(logger.resource.toString(), disposables);
+	}
+
+	private deregisterLogChannel(logger: ILoggerResource): void {
+		this.loggerDisposables.deleteAndDispose(logger.resource.toString());
 	}
 
 	private async whenFileExists(file: URI, trial: number, token: CancellationToken): Promise<void> {

From d5b7644d9ba0779d1675bf5a54a895cb82533569 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 4 Sep 2023 14:55:16 +0200
Subject: [PATCH 63/94] Splits up keepAlive into keepObserved and
 recomputeInitiallyAndOnChange

---
 src/vs/base/common/observable.ts              |  3 +-
 .../base/common/observableInternal/utils.ts   | 30 ++++++++++---------
 src/vs/base/test/common/observable.test.ts    |  4 +--
 .../diffEditorWidget2/accessibleDiffViewer.ts |  4 +--
 .../diffEditorWidget2/diffEditorWidget2.ts    |  6 ++--
 .../diffEditorWidget2/movedBlocksLines.ts     |  4 +--
 .../browser/inlineCompletionsModel.ts         |  4 +--
 .../browser/model/mergeEditorModel.ts         |  8 ++---
 .../textMateWorkerTokenizerController.ts      |  4 +--
 .../tokenizationSupportWithLineLimit.ts       |  4 +--
 10 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/vs/base/common/observable.ts b/src/vs/base/common/observable.ts
index 895ba31352d..2e0023bbc55 100644
--- a/src/vs/base/common/observable.ts
+++ b/src/vs/base/common/observable.ts
@@ -37,7 +37,8 @@ export {
 	debouncedObservable,
 	derivedObservableWithCache,
 	derivedObservableWithWritableCache,
-	keepAlive,
+	keepObserved,
+	recomputeInitiallyAndOnChange,
 	observableFromEvent,
 	observableFromPromise,
 	observableSignal,
diff --git a/src/vs/base/common/observableInternal/utils.ts b/src/vs/base/common/observableInternal/utils.ts
index 8717248dee9..39a31e0dda1 100644
--- a/src/vs/base/common/observableInternal/utils.ts
+++ b/src/vs/base/common/observableInternal/utils.ts
@@ -294,22 +294,24 @@ export function wasEventTriggeredRecently(event: Event<any>, timeoutMs: number,
 	return observable;
 }
 
-// TODO@hediet: Have `keepCacheAlive` and `recomputeOnChange` instead of forceRecompute
 /**
- * This ensures the observable is being observed.
- * Observed observables (such as {@link derived}s) can maintain a cache, as they receive invalidation events.
- * Unobserved observables are forced to recompute their value from scratch every time they are read.
- *
- * @param observable the observable to keep alive
- * @param forceRecompute if true, the observable will be eagerly recomputed after it changed.
- * Use this if recomputing the observables causes side-effects.
-*/
-export function keepAlive(observable: IObservable<any>, forceRecompute?: boolean): IDisposable {
-	const o = new KeepAliveObserver(forceRecompute ?? false);
+ * This makes sure the observable is being observed and keeps its cache alive.
+ */
+export function keepObserved<T>(observable: IObservable<T>): IDisposable {
+	const o = new KeepAliveObserver(false);
 	observable.addObserver(o);
-	if (forceRecompute) {
-		observable.reportChanges();
-	}
+	return toDisposable(() => {
+		observable.removeObserver(o);
+	});
+}
+
+/**
+ * This converts the given observable into an autorun.
+ */
+export function recomputeInitiallyAndOnChange<T>(observable: IObservable<T>): IDisposable {
+	const o = new KeepAliveObserver(true);
+	observable.addObserver(o);
+	observable.reportChanges();
 
 	return toDisposable(() => {
 		observable.removeObserver(o);
diff --git a/src/vs/base/test/common/observable.test.ts b/src/vs/base/test/common/observable.test.ts
index 4f507c7ece7..5b1a273f767 100644
--- a/src/vs/base/test/common/observable.test.ts
+++ b/src/vs/base/test/common/observable.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { Emitter, Event } from 'vs/base/common/event';
-import { ISettableObservable, autorun, derived, ITransaction, observableFromEvent, observableValue, transaction, keepAlive } from 'vs/base/common/observable';
+import { ISettableObservable, autorun, derived, ITransaction, observableFromEvent, observableValue, transaction, keepObserved } from 'vs/base/common/observable';
 import { BaseObservable, IObservable, IObserver } from 'vs/base/common/observableInternal/base';
 
 suite('observables', () => {
@@ -205,7 +205,7 @@ suite('observables', () => {
 				'value: 5',
 			]);
 
-			const disposable = keepAlive(computedSum); // Use keepAlive to keep the cache
+			const disposable = keepObserved(computedSum); // Use keepAlive to keep the cache
 			log.log(`value: ${computedSum.get()}`);
 			assert.deepStrictEqual(log.getAndClearEntries(), [
 				'recompute1: 1 % 3 = 1',
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
index 29022fd8bf1..3f45fae3b99 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
@@ -11,7 +11,7 @@ import { forEachAdjacent, groupAdjacentBy } from 'vs/base/common/arrays';
 import { Codicon } from 'vs/base/common/codicons';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, ITransaction, autorun, autorunWithStore, derived, derivedWithStore, keepAlive, observableValue, subtransaction, transaction } from 'vs/base/common/observable';
+import { IObservable, ITransaction, autorun, autorunWithStore, derived, derivedWithStore, recomputeInitiallyAndOnChange, observableValue, subtransaction, transaction } from 'vs/base/common/observable';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
 import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors';
@@ -51,7 +51,7 @@ export class AccessibleDiffViewer extends Disposable {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
-		this._register(keepAlive(this.model, true));
+		this._register(recomputeInitiallyAndOnChange(this.model));
 	}
 
 	private readonly model = derivedWithStore(this, (reader, store) => {
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
index bd99533b577..6ad55e44773 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
@@ -7,7 +7,7 @@ import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
 import { findLast } from 'vs/base/common/arrays';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Event } from 'vs/base/common/event';
-import { IObservable, autorun, autorunWithStore, derived, derivedWithStore, disposableObservableValue, keepAlive, observableValue, transaction } from 'vs/base/common/observable';
+import { IObservable, autorun, autorunWithStore, derived, derivedWithStore, disposableObservableValue, recomputeInitiallyAndOnChange, observableValue, transaction } from 'vs/base/common/observable';
 import 'vs/css!./style';
 import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
 import { ICodeEditor, IDiffEditor, IDiffEditorConstructionOptions, IMouseTargetViewZone } from 'vs/editor/browser/editorBrowser';
@@ -157,7 +157,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 			}));
 			return result;
 		});
-		this._register(keepAlive(this._sash, true));
+		this._register(recomputeInitiallyAndOnChange(this._sash));
 
 		this._register(autorunWithStore((reader, store) => {
 			/** @description UnchangedRangesFeature */
@@ -218,7 +218,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 
 		codeEditorService.addDiffEditor(this);
 
-		this._register(keepAlive(this._layoutInfo, true));
+		this._register(recomputeInitiallyAndOnChange(this._layoutInfo));
 
 		this._register(autorunWithStore((reader, store) => {
 			this.movedBlocksLinesPart.set(store.add(new (readHotReloadableExport(MovedBlocksLinesPart, reader))(
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts b/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts
index 1cb8f2d27ca..c8ed76eb54c 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts
@@ -9,7 +9,7 @@ import { Action } from 'vs/base/common/actions';
 import { booleanComparator, compareBy, findMaxIdxBy, numberComparator, tieBreakComparators } from 'vs/base/common/arrays';
 import { Codicon } from 'vs/base/common/codicons';
 import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, autorunHandleChanges, autorunWithStore, constObservable, derived, derivedWithStore, keepAlive, observableFromEvent, observableSignalFromEvent, observableValue } from 'vs/base/common/observable';
+import { IObservable, autorun, autorunHandleChanges, autorunWithStore, constObservable, derived, derivedWithStore, observableFromEvent, observableSignalFromEvent, observableValue, recomputeInitiallyAndOnChange } from 'vs/base/common/observable';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { DiffEditorEditors } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors';
@@ -58,7 +58,7 @@ export class MovedBlocksLinesPart extends Disposable {
 			this._element.style.width = `${info.verticalScrollbarWidth + info.contentLeft - MovedBlocksLinesPart.movedCodeBlockPadding + this.width.read(reader)}px`;
 		}));
 
-		this._register(keepAlive(this._state, true));
+		this._register(recomputeInitiallyAndOnChange(this._state));
 
 		const movedBlockViewZones = derived(reader => {
 			const model = this._diffModel.read(reader);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
index b67a29ea576..e3e387ea66d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
@@ -6,7 +6,7 @@
 import { mapFind } from 'vs/base/common/arrays';
 import { BugIndicatingError, onUnexpectedExternalError } from 'vs/base/common/errors';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, IReader, ITransaction, autorun, derived, derivedHandleChanges, derivedOpts, keepAlive, observableSignal, observableValue, subtransaction, transaction } from 'vs/base/common/observable';
+import { IObservable, IReader, ITransaction, autorun, derived, derivedHandleChanges, derivedOpts, recomputeInitiallyAndOnChange, observableSignal, observableValue, subtransaction, transaction } from 'vs/base/common/observable';
 import { isDefined } from 'vs/base/common/types';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
@@ -59,7 +59,7 @@ export class InlineCompletionsModel extends Disposable {
 	) {
 		super();
 
-		this._register(keepAlive(this._fetchInlineCompletions, true));
+		this._register(recomputeInitiallyAndOnChange(this._fetchInlineCompletions));
 
 		let lastItem: InlineCompletionWithUpdatedRange | undefined = undefined;
 		this._register(autorun(reader => {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
index f1e508e57a7..f6a2ea598b0 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
@@ -5,7 +5,7 @@
 
 import { CompareResult, equals } from 'vs/base/common/arrays';
 import { BugIndicatingError } from 'vs/base/common/errors';
-import { autorunHandleChanges, derived, IObservable, IReader, ISettableObservable, ITransaction, keepAlive, observableValue, transaction, waitForState } from 'vs/base/common/observable';
+import { autorunHandleChanges, derived, IObservable, IReader, ISettableObservable, ITransaction, keepObserved, observableValue, transaction, waitForState } from 'vs/base/common/observable';
 import { URI } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
 import { ILanguageService } from 'vs/editor/common/languages/language';
@@ -62,9 +62,9 @@ export class MergeEditorModel extends EditorModel {
 	) {
 		super();
 
-		this._register(keepAlive(this.modifiedBaseRangeResultStates));
-		this._register(keepAlive(this.input1ResultMapping));
-		this._register(keepAlive(this.input2ResultMapping));
+		this._register(keepObserved(this.modifiedBaseRangeResultStates));
+		this._register(keepObserved(this.input1ResultMapping));
+		this._register(keepObserved(this.input2ResultMapping));
 
 		const initializePromise = this.initialize();
 
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
index f40a12b0380..850b58e1e6c 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
@@ -5,7 +5,7 @@
 
 import { importAMDNodeModule } from 'vs/amdX';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, autorun, keepAlive, observableFromEvent } from 'vs/base/common/observable';
+import { IObservable, autorun, keepObserved, observableFromEvent } from 'vs/base/common/observable';
 import { countEOL } from 'vs/editor/common/core/eolCounter';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { Range } from 'vs/editor/common/core/range';
@@ -46,7 +46,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 	) {
 		super();
 
-		this._register(keepAlive(this._loggingEnabled));
+		this._register(keepObserved(this._loggingEnabled));
 
 		this._register(this._model.onDidChangeContent((e) => {
 			if (this._shouldLog) {
diff --git a/src/vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit.ts b/src/vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit.ts
index f46faf03c24..f5bd00e965e 100644
--- a/src/vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit.ts
+++ b/src/vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit.ts
@@ -8,7 +8,7 @@ import { EncodedTokenizationResult, IBackgroundTokenizationStore, IBackgroundTok
 import { nullTokenizeEncoded } from 'vs/editor/common/languages/nullTokenize';
 import { ITextModel } from 'vs/editor/common/model';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IObservable, keepAlive } from 'vs/base/common/observable';
+import { IObservable, keepObserved } from 'vs/base/common/observable';
 
 export class TokenizationSupportWithLineLimit extends Disposable implements ITokenizationSupport {
 	get backgroundTokenizerShouldOnlyVerifyTokens(): boolean | undefined {
@@ -22,7 +22,7 @@ export class TokenizationSupportWithLineLimit extends Disposable implements ITok
 	) {
 		super();
 
-		this._register(keepAlive(this._maxTokenizationLineLength));
+		this._register(keepObserved(this._maxTokenizationLineLength));
 	}
 
 	getInitialState(): IState {

From 0f816a3513866ddd532a84b6e192efb7bd8380d8 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 4 Sep 2023 15:12:16 +0200
Subject: [PATCH 64/94] Diff Algorithm refactoring

---
 .../{computeMoves.ts => computeMovedLines.ts}        |  2 +-
 .../defaultLinesDiffComputer.ts                      | 12 ++++++------
 .../heuristicSequenceOptimizations.ts                |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename src/vs/editor/common/diff/defaultLinesDiffComputer/{computeMoves.ts => computeMovedLines.ts} (99%)

diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMoves.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
similarity index 99%
rename from src/vs/editor/common/diff/defaultLinesDiffComputer/computeMoves.ts
rename to src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
index a148f75de3e..6436ad0d9e0 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMoves.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
@@ -14,7 +14,7 @@ import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffCo
 import { LineRangeFragment, isSpace } from 'vs/editor/common/diff/defaultLinesDiffComputer/utils';
 import { MyersDiffAlgorithm } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm';
 
-export function computeMoves(
+export function computeMovedLines(
 	changes: DetailedLineRangeMapping[],
 	originalLines: string[],
 	modifiedLines: string[],
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
index c94f8cea008..e2de212aa40 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
@@ -12,8 +12,8 @@ import { Range } from 'vs/editor/common/core/range';
 import { DateTimeout, ITimeout, InfiniteTimeout, SequenceDiff } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
 import { DynamicProgrammingDiffing } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing';
 import { MyersDiffAlgorithm } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm';
-import { computeMoves } from 'vs/editor/common/diff/defaultLinesDiffComputer/computeMoves';
-import { extendDiffsToEntireWordIfAppropriate, optimizeSequenceDiffs, removeRandomLineMatches, removeRandomMatches, smoothenSequenceDiffs } from 'vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations';
+import { computeMovedLines } from 'vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines';
+import { extendDiffsToEntireWordIfAppropriate, optimizeSequenceDiffs, removeVeryShortMatchingLinesBetweenDiffs, removeVeryShortMatchingTextBetweenLongDiffs, removeShortMatches } from 'vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations';
 import { ILinesDiffComputer, ILinesDiffComputerOptions, LinesDiff, MovedText } from 'vs/editor/common/diff/linesDiffComputer';
 import { DetailedLineRangeMapping, RangeMapping } from '../rangeMapping';
 import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
@@ -87,7 +87,7 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 		let lineAlignments = lineAlignmentResult.diffs;
 		let hitTimeout = lineAlignmentResult.hitTimeout;
 		lineAlignments = optimizeSequenceDiffs(sequence1, sequence2, lineAlignments);
-		lineAlignments = removeRandomLineMatches(sequence1, sequence2, lineAlignments);
+		lineAlignments = removeVeryShortMatchingLinesBetweenDiffs(sequence1, sequence2, lineAlignments);
 
 		const alignments: RangeMapping[] = [];
 
@@ -187,7 +187,7 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 		timeout: ITimeout,
 		considerWhitespaceChanges: boolean,
 	): MovedText[] {
-		const moves = computeMoves(
+		const moves = computeMovedLines(
 			changes,
 			originalLines,
 			modifiedLines,
@@ -217,8 +217,8 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 		let diffs = diffResult.diffs;
 		diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
 		diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs);
-		diffs = smoothenSequenceDiffs(slice1, slice2, diffs);
-		diffs = removeRandomMatches(slice1, slice2, diffs);
+		diffs = removeShortMatches(slice1, slice2, diffs);
+		diffs = removeVeryShortMatchingTextBetweenLongDiffs(slice1, slice2, diffs);
 
 		const result = diffs.map(
 			(d) =>
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
index d39fc3c93e7..b288c473874 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
@@ -196,7 +196,7 @@ function shiftDiffToBetterPosition(diff: SequenceDiff, sequence1: ISequence, seq
 	return diff.delta(bestDelta);
 }
 
-export function smoothenSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+export function removeShortMatches(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
 	const result: SequenceDiff[] = [];
 	for (const s of sequenceDiffs) {
 		const last = result[result.length - 1];
@@ -310,7 +310,7 @@ function mergeSequenceDiffs(sequenceDiffs1: SequenceDiff[], sequenceDiffs2: Sequ
 	return result;
 }
 
-export function removeRandomLineMatches(sequence1: LineSequence, _sequence2: LineSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+export function removeVeryShortMatchingLinesBetweenDiffs(sequence1: LineSequence, _sequence2: LineSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
 	let diffs = sequenceDiffs;
 	if (diffs.length === 0) {
 		return diffs;
@@ -357,7 +357,7 @@ export function removeRandomLineMatches(sequence1: LineSequence, _sequence2: Lin
 	return diffs;
 }
 
-export function removeRandomMatches(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+export function removeVeryShortMatchingTextBetweenLongDiffs(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
 	let diffs = sequenceDiffs;
 	if (diffs.length === 0) {
 		return diffs;

From 4a3ed95527eea750a62ad484d61c08baae571285 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 4 Sep 2023 15:40:56 +0200
Subject: [PATCH 65/94] Git - clarify git extension API usage (#192139)

* Git - clarify git extension API usage

* Fixed white space
---
 extensions/git/README.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/extensions/git/README.md b/extensions/git/README.md
index 2a6678de933..97911b612ee 100644
--- a/extensions/git/README.md
+++ b/extensions/git/README.md
@@ -14,7 +14,13 @@ The Git extension exposes an API, reachable by any other extension.
 2. Include `git.d.ts` in your extension's compilation.
 3. Get a hold of the API with the following snippet:
 
- ```ts
- const gitExtension = vscode.extensions.getExtension<GitExtension>('vscode.git').exports;
- const git = gitExtension.getAPI(1);
- ```
+	```ts
+	const gitExtension = vscode.extensions.getExtension<GitExtension>('vscode.git').exports;
+	const git = gitExtension.getAPI(1);
+	```
+	**Note:** To ensure that the `vscode.git` extension is activated before your extension, add `extensionDependencies` ([docs](https://code.visualstudio.com/api/references/extension-manifest)) into the `package.json` of your extension:
+	```json
+	"extensionDependencies": [
+		"vscode.git"
+	]
+	```

From e01815dd6188efa6b8226e7128a9e663251195f1 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 4 Sep 2023 16:07:57 +0200
Subject: [PATCH 66/94] fix #188929 (#192140)

---
 .../test/common/globalStateSync.test.ts       |  8 +++---
 .../test/common/keybindingsSync.test.ts       |  8 +++---
 .../test/common/settingsSync.test.ts          | 15 +++++++----
 .../test/common/snippetsSync.test.ts          |  8 +++---
 .../test/common/synchronizer.test.ts          | 26 +++++++++----------
 .../test/common/tasksSync.test.ts             |  8 +++---
 .../userDataProfilesManifestSync.test.ts      |  8 +++---
 7 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/src/vs/platform/userDataSync/test/common/globalStateSync.test.ts b/src/vs/platform/userDataSync/test/common/globalStateSync.test.ts
index b7f6c141b02..6cf08639193 100644
--- a/src/vs/platform/userDataSync/test/common/globalStateSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/globalStateSync.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { VSBuffer } from 'vs/base/common/buffer';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IFileService } from 'vs/platform/files/common/files';
@@ -30,13 +30,15 @@ suite('GlobalStateSync', () => {
 		testClient = disposableStore.add(new UserDataSyncClient(server));
 		await testClient.setUp(true);
 		testObject = testClient.getSynchronizer(SyncResource.GlobalState) as GlobalStateSynchroniser;
-		disposableStore.add(toDisposable(() => testClient.instantiationService.get(IUserDataSyncStoreService).clear()));
 
 		client2 = disposableStore.add(new UserDataSyncClient(server));
 		await client2.setUp(true);
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await testClient.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
 
 	test('when global state does not exist', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		assert.deepStrictEqual(await testObject.getLastSyncUserData(), null);
diff --git a/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts b/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
index 5cd86e8c54f..44fb14361a7 100644
--- a/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { VSBuffer } from 'vs/base/common/buffer';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IFileService } from 'vs/platform/files/common/files';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
@@ -25,10 +25,12 @@ suite('KeybindingsSync', () => {
 		client = disposableStore.add(new UserDataSyncClient(server));
 		await client.setUp(true);
 		testObject = client.getSynchronizer(SyncResource.Keybindings) as KeybindingsSynchroniser;
-		disposableStore.add(toDisposable(() => client.instantiationService.get(IUserDataSyncStoreService).clear()));
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await client.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
 
 	test('when keybindings file does not exist', async () => {
 		const fileService = client.instantiationService.get(IFileService);
diff --git a/src/vs/platform/userDataSync/test/common/settingsSync.test.ts b/src/vs/platform/userDataSync/test/common/settingsSync.test.ts
index 6db2d5ace07..8ce9aadef2d 100644
--- a/src/vs/platform/userDataSync/test/common/settingsSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/settingsSync.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { Event } from 'vs/base/common/event';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
@@ -42,10 +42,12 @@ suite('SettingsSync - Auto', () => {
 		client = disposableStore.add(new UserDataSyncClient(server));
 		await client.setUp(true);
 		testObject = client.getSynchronizer(SyncResource.Settings) as SettingsSynchroniser;
-		disposableStore.add(toDisposable(() => client.instantiationService.get(IUserDataSyncStoreService).clear()));
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await client.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
 
 	test('when settings file does not exist', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		const fileService = client.instantiationService.get(IFileService);
@@ -536,10 +538,13 @@ suite('SettingsSync - Manual', () => {
 		client = disposableStore.add(new UserDataSyncClient(server));
 		await client.setUp(true);
 		testObject = client.getSynchronizer(SyncResource.Settings) as SettingsSynchroniser;
-		disposableStore.add(toDisposable(() => client.instantiationService.get(IUserDataSyncStoreService).clear()));
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await client.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
+
 
 	test('do not sync ignored settings', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		const settingsContent =
diff --git a/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts b/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
index 4e50a73e94d..2b39ada8d1c 100644
--- a/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { IStringDictionary } from 'vs/base/common/collections';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { dirname, joinPath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -159,13 +159,15 @@ suite('SnippetsSync', () => {
 		testClient = disposableStore.add(new UserDataSyncClient(server));
 		await testClient.setUp(true);
 		testObject = testClient.getSynchronizer(SyncResource.Snippets) as SnippetsSynchroniser;
-		disposableStore.add(toDisposable(() => testClient.instantiationService.get(IUserDataSyncStoreService).clear()));
 
 		client2 = disposableStore.add(new UserDataSyncClient(server));
 		await client2.setUp(true);
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await testClient.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
 
 	test('when snippets does not exist', async () => {
 		const fileService = testClient.instantiationService.get(IFileService);
diff --git a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
index 87a6062b6af..1db10faccdc 100644
--- a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
+++ b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
@@ -8,7 +8,7 @@ import { Barrier } from 'vs/base/common/async';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { isEqual, joinPath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
@@ -180,16 +180,16 @@ suite('TestSynchronizer - Auto Sync', () => {
 	const disposableStore = new DisposableStore();
 	const server = new UserDataSyncTestServer();
 	let client: UserDataSyncClient;
-	let userDataSyncStoreService: IUserDataSyncStoreService;
 
 	setup(async () => {
 		client = disposableStore.add(new UserDataSyncClient(server));
 		await client.setUp();
-		userDataSyncStoreService = client.instantiationService.get(IUserDataSyncStoreService);
-		disposableStore.add(toDisposable(() => userDataSyncStoreService.clear()));
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await client.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
 
 	test('status is syncing', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
@@ -487,16 +487,16 @@ suite('TestSynchronizer - Manual Sync', () => {
 	const disposableStore = new DisposableStore();
 	const server = new UserDataSyncTestServer();
 	let client: UserDataSyncClient;
-	let userDataSyncStoreService: IUserDataSyncStoreService;
 
 	setup(async () => {
 		client = disposableStore.add(new UserDataSyncClient(server));
 		await client.setUp();
-		userDataSyncStoreService = client.instantiationService.get(IUserDataSyncStoreService);
-		disposableStore.add(toDisposable(() => userDataSyncStoreService.clear()));
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await client.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
 
 	test('preview', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
@@ -1065,16 +1065,16 @@ suite('TestSynchronizer - Last Sync Data', () => {
 	const disposableStore = new DisposableStore();
 	const server = new UserDataSyncTestServer();
 	let client: UserDataSyncClient;
-	let userDataSyncStoreService: IUserDataSyncStoreService;
 
 	setup(async () => {
 		client = disposableStore.add(new UserDataSyncClient(server));
 		await client.setUp();
-		userDataSyncStoreService = client.instantiationService.get(IUserDataSyncStoreService);
-		disposableStore.add(toDisposable(() => userDataSyncStoreService.clear()));
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await client.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
 
 	test('last sync data is null when not synced before', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
 		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
diff --git a/src/vs/platform/userDataSync/test/common/tasksSync.test.ts b/src/vs/platform/userDataSync/test/common/tasksSync.test.ts
index cc9760bcf4c..01be339a733 100644
--- a/src/vs/platform/userDataSync/test/common/tasksSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/tasksSync.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { VSBuffer } from 'vs/base/common/buffer';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IFileService } from 'vs/platform/files/common/files';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
@@ -25,10 +25,12 @@ suite('TasksSync', () => {
 		client = disposableStore.add(new UserDataSyncClient(server));
 		await client.setUp(true);
 		testObject = client.getSynchronizer(SyncResource.Tasks) as TasksSynchroniser;
-		disposableStore.add(toDisposable(() => client.instantiationService.get(IUserDataSyncStoreService).clear()));
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await client.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
 
 	test('when tasks file does not exist', async () => {
 		const fileService = client.instantiationService.get(IFileService);
diff --git a/src/vs/platform/userDataSync/test/common/userDataProfilesManifestSync.test.ts b/src/vs/platform/userDataSync/test/common/userDataProfilesManifestSync.test.ts
index d1c7b6f572d..502dc913380 100644
--- a/src/vs/platform/userDataSync/test/common/userDataProfilesManifestSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataProfilesManifestSync.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { UserDataProfilesManifestSynchroniser } from 'vs/platform/userDataSync/common/userDataProfilesManifestSync';
 import { ISyncData, ISyncUserDataProfile, IUserDataSyncStoreService, SyncResource, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync';
@@ -23,13 +23,15 @@ suite('UserDataProfilesManifestSync', () => {
 		testClient = disposableStore.add(new UserDataSyncClient(server));
 		await testClient.setUp(true);
 		testObject = testClient.getSynchronizer(SyncResource.Profiles) as UserDataProfilesManifestSynchroniser;
-		disposableStore.add(toDisposable(() => testClient.instantiationService.get(IUserDataSyncStoreService).clear()));
 
 		client2 = disposableStore.add(new UserDataSyncClient(server));
 		await client2.setUp(true);
 	});
 
-	teardown(() => disposableStore.clear());
+	teardown(async () => {
+		await testClient.instantiationService.get(IUserDataSyncStoreService).clear();
+		disposableStore.clear();
+	});
 
 	test('when profiles does not exist', async () => {
 		assert.deepStrictEqual(await testObject.getLastSyncUserData(), null);

From 5e0bc193c85a18756e4b45d8050b8718c724804d Mon Sep 17 00:00:00 2001
From: wickles <4229542+wickles@users.noreply.github.com>
Date: Mon, 4 Sep 2023 07:20:39 -0700
Subject: [PATCH 67/94] Detect more scoop git bash paths (#192085)

Fixes #192084
---
 src/vs/platform/terminal/node/terminalProfiles.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/platform/terminal/node/terminalProfiles.ts b/src/vs/platform/terminal/node/terminalProfiles.ts
index 7be7e1c3663..bf5375b17a1 100644
--- a/src/vs/platform/terminal/node/terminalProfiles.ts
+++ b/src/vs/platform/terminal/node/terminalProfiles.ts
@@ -323,6 +323,7 @@ async function getGitBashPaths(): Promise<string[]> {
 	}
 
 	// Add special installs that don't follow the standard directory structure
+	gitBashPaths.push(`${process.env['UserProfile']}\\scoop\\apps\\git\\current\\bin\\bash.exe`);
 	gitBashPaths.push(`${process.env['UserProfile']}\\scoop\\apps\\git-with-openssh\\current\\bin\\bash.exe`);
 
 	return gitBashPaths;

From 56e5b04235c16a00df1705cce7083be8e53df28a Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 4 Sep 2023 16:39:16 +0200
Subject: [PATCH 68/94] joh/marine pinniped (#192145)

* merge adjacent edits when making more minimal edits

* before making them more minimal, group bulk texts into buckets of simple and not so simple edits
---
 .../common/services/editorSimpleWorker.ts     | 13 ++++++
 .../services/editorSimpleWorker.test.ts       | 35 +++++++++++++++
 .../contrib/bulkEdit/browser/bulkTextEdits.ts | 44 ++++++++++++-------
 3 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index 86ae8f966a4..ef8fb85da14 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -511,6 +511,19 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 			return aRng - bRng;
 		});
 
+		// merge adjacent edits
+		let writeIndex = 0;
+		for (let readIndex = 1; readIndex < edits.length; readIndex++) {
+			if (Range.getEndPosition(edits[writeIndex].range).equals(Range.getStartPosition(edits[readIndex].range))) {
+				edits[writeIndex].range = Range.fromPositions(Range.getStartPosition(edits[writeIndex].range), Range.getEndPosition(edits[readIndex].range));
+				edits[writeIndex].text += edits[readIndex].text;
+			} else {
+				writeIndex++;
+				edits[writeIndex] = edits[readIndex];
+			}
+		}
+		edits.length = writeIndex + 1;
+
 		for (let { range, text, eol } of edits) {
 
 			if (typeof eol === 'number') {
diff --git a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
index f2cb9374f87..9596c1225c6 100644
--- a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
+++ b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
@@ -98,6 +98,41 @@ suite('EditorSimpleWorker', () => {
 		});
 	});
 
+	test('MoreMinimal, merge adjacent edits', async function () {
+
+		const model = worker.addModel([
+			'one',
+			'two',
+			'three',
+			'four',
+			'five'
+		], '\n');
+
+
+		const newEdits = await worker.computeMoreMinimalEdits(model.uri.toString(), [
+			{
+				range: new Range(1, 1, 2, 1),
+				text: 'one\ntwo\nthree\n',
+			}, {
+				range: new Range(2, 1, 3, 1),
+				text: '',
+			}, {
+				range: new Range(3, 1, 4, 1),
+				text: '',
+			}, {
+				range: new Range(4, 2, 4, 3),
+				text: '4',
+			}, {
+				range: new Range(5, 3, 5, 5),
+				text: '5',
+			}
+		], false);
+
+		assert.strictEqual(newEdits.length, 2);
+		assert.strictEqual(newEdits[0].text, '4');
+		assert.strictEqual(newEdits[1].text, '5');
+	});
+
 	test('MoreMinimal, issue #15385 newline changes only', function () {
 
 		const model = worker.addModel([
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts
index 89f57338c7d..715b2edc5ca 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts
@@ -227,7 +227,7 @@ export class BulkTextEdits {
 		const tasks: ModelEditTask[] = [];
 		const promises: Promise<any>[] = [];
 
-		for (const [key, value] of this._edits) {
+		for (const [key, edits] of this._edits) {
 			const promise = this._textModelResolverService.createModelReference(key).then(async ref => {
 				let task: ModelEditTask;
 				let makeMinimal = false;
@@ -237,23 +237,37 @@ export class BulkTextEdits {
 				} else {
 					task = new ModelEditTask(ref);
 				}
+				tasks.push(task);
 
-				for (const edit of value) {
-					if (makeMinimal && !edit.textEdit.insertAsSnippet) {
-						const newEdits = await this._editorWorker.computeMoreMinimalEdits(edit.resource, [edit.textEdit]);
-						if (!newEdits) {
-							task.addEdit(edit);
-						} else {
-							for (const moreMinialEdit of newEdits) {
-								task.addEdit(new ResourceTextEdit(edit.resource, moreMinialEdit, edit.versionId, edit.metadata));
-							}
-						}
-					} else {
-						task.addEdit(edit);
-					}
+
+				if (!makeMinimal) {
+					edits.forEach(task.addEdit, task);
+					return;
 				}
 
-				tasks.push(task);
+				// group edits by type (snippet, metadata, or simple) and make simple groups more minimal
+
+				const makeGroupMoreMinimal = async (start: number, end: number) => {
+					const oldEdits = edits.slice(start, end);
+					const newEdits = await this._editorWorker.computeMoreMinimalEdits(ref.object.textEditorModel.uri, oldEdits.map(e => e.textEdit), false);
+					if (!newEdits) {
+						oldEdits.forEach(task.addEdit, task);
+					} else {
+						newEdits.forEach(edit => task.addEdit(new ResourceTextEdit(ref.object.textEditorModel.uri, edit, undefined, undefined)));
+					}
+				};
+
+				let start = 0;
+				let i = 0;
+				for (; i < edits.length; i++) {
+					if (edits[i].textEdit.insertAsSnippet || edits[i].metadata) {
+						await makeGroupMoreMinimal(start, i); // grouped edits until now
+						task.addEdit(edits[i]); // this edit
+						start = i + 1;
+					}
+				}
+				await makeGroupMoreMinimal(start, i);
+
 			});
 			promises.push(promise);
 		}

From 014d29b8dbc5e606a79a5fae80b2be9435b1ee36 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Mon, 4 Sep 2023 16:43:26 +0200
Subject: [PATCH 69/94] no import-require please

---
 src/vs/base/test/common/arraysFind.test.ts                      | 2 +-
 src/vs/base/test/node/snapshot.test.ts                          | 2 +-
 src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts     | 2 +-
 src/vs/editor/test/common/core/lineRange.test.ts                | 2 +-
 .../notebook/test/browser/contrib/outputCopyTests.test.ts       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/base/test/common/arraysFind.test.ts b/src/vs/base/test/common/arraysFind.test.ts
index db9fcc44b82..00ef5b6112a 100644
--- a/src/vs/base/test/common/arraysFind.test.ts
+++ b/src/vs/base/test/common/arraysFind.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import assert = require('assert');
+import * as assert from 'assert';
 import { MonotonousArray, findFirstMonotonous, findLastMonotonous } from 'vs/base/common/arraysFind';
 
 suite('Arrays', () => {
diff --git a/src/vs/base/test/node/snapshot.test.ts b/src/vs/base/test/node/snapshot.test.ts
index 6c12ae70dd3..b7edc05d34c 100644
--- a/src/vs/base/test/node/snapshot.test.ts
+++ b/src/vs/base/test/node/snapshot.test.ts
@@ -8,7 +8,7 @@ import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { Promises } from 'vs/base/node/pfs';
 import { SnapshotContext, assertSnapshot } from 'vs/base/test/common/snapshot';
 import { URI } from 'vs/base/common/uri';
-import path = require('path');
+import * as path from 'path';
 import { assertThrowsAsync } from 'vs/base/test/common/utils';
 
 // tests for snapshot are in Node so that we can use native FS operations to
diff --git a/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts b/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
index 20486434dc4..63b7f923b00 100644
--- a/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
+++ b/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import assert = require('assert');
+import * as assert from 'assert';
 import { UnchangedRegion } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
diff --git a/src/vs/editor/test/common/core/lineRange.test.ts b/src/vs/editor/test/common/core/lineRange.test.ts
index 535a20607b1..919efee77a5 100644
--- a/src/vs/editor/test/common/core/lineRange.test.ts
+++ b/src/vs/editor/test/common/core/lineRange.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import assert = require('assert');
+import * as assert from 'assert';
 import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
 
 suite('LineRange', () => {
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/outputCopyTests.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/outputCopyTests.test.ts
index 3d99ff7b698..1646685196d 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/outputCopyTests.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/outputCopyTests.test.ts
@@ -7,7 +7,7 @@ import { ICellOutputViewModel, ICellViewModel } from 'vs/workbench/contrib/noteb
 import { mock } from 'vs/base/test/common/mock';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ILogService } from 'vs/platform/log/common/log';
-import assert = require('assert');
+import * as assert from 'assert';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { IOutputItemDto } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { copyCellOutput } from 'vs/workbench/contrib/notebook/browser/contrib/clipboard/cellOutputClipboard';

From 9392904ae408559d1c60e120e598f5360c4e361a Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 4 Sep 2023 17:12:32 +0200
Subject: [PATCH 70/94] support diff with reading from stdin (#192149)

support diff with reading from stdin. https://github.com/microsoft/vscode-remote-release/issues/8876
---
 src/vs/server/node/server.cli.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
index 6163df61949..e8ac628a02f 100644
--- a/src/vs/server/node/server.cli.ts
+++ b/src/vs/server/node/server.cli.ts
@@ -181,7 +181,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 
 	parsedArgs['_'] = [];
 
-	if (hasReadStdinArg && fileURIs.length === 0 && folderURIs.length === 0 && hasStdinWithoutTty()) {
+	if (hasReadStdinArg && hasStdinWithoutTty()) {
 		try {
 			let stdinFilePath = cliStdInFilePath;
 			if (!stdinFilePath) {

From eafe1c398d974f5c7611ef8ca273e26cebd72b40 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 4 Sep 2023 17:29:31 +0200
Subject: [PATCH 71/94] #191860 skip until insiders is released

---
 test/smoke/src/areas/extensions/extensions.test.ts  | 2 +-
 test/smoke/src/areas/workbench/localization.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts
index c78cbe87089..bc65a8631c4 100644
--- a/test/smoke/src/areas/extensions/extensions.test.ts
+++ b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -7,7 +7,7 @@ import { Application, Logger } from '../../../../automation';
 import { installAllHandlers } from '../../utils';
 
 export function setup(logger: Logger) {
-	describe('Extensions', () => {
+	describe.skip('Extensions', () => {
 
 		// Shared before/after handling
 		installAllHandlers(logger);
diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts
index 12e49ce549e..865add9ae79 100644
--- a/test/smoke/src/areas/workbench/localization.test.ts
+++ b/test/smoke/src/areas/workbench/localization.test.ts
@@ -8,7 +8,7 @@ import { installAllHandlers } from '../../utils';
 
 export function setup(logger: Logger) {
 
-	describe('Localization', () => {
+	describe.skip('Localization', () => {
 		// Shared before/after handling
 		installAllHandlers(logger);
 

From 83c8a64a9f9d2ecede52e310c412952ba2505944 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 4 Sep 2023 17:39:14 +0200
Subject: [PATCH 72/94] fix #180695 (#192141)

---
 .../environment/electron-main/environmentMainService.ts     | 4 ----
 src/vs/platform/userData/common/fileUserDataProvider.ts     | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/platform/environment/electron-main/environmentMainService.ts b/src/vs/platform/environment/electron-main/environmentMainService.ts
index aab03b3130f..748ff075783 100644
--- a/src/vs/platform/environment/electron-main/environmentMainService.ts
+++ b/src/vs/platform/environment/electron-main/environmentMainService.ts
@@ -6,7 +6,6 @@
 import { memoize } from 'vs/base/common/decorators';
 import { join } from 'vs/base/common/path';
 import { isLinux } from 'vs/base/common/platform';
-import { URI } from 'vs/base/common/uri';
 import { createStaticIPCHandle } from 'vs/base/parts/ipc/node/ipc.net';
 import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
@@ -69,9 +68,6 @@ export class EnvironmentMainService extends NativeEnvironmentService implements
 	@memoize
 	get useCodeCache(): boolean { return !!this.codeCachePath; }
 
-	@memoize
-	override get userRoamingDataHome(): URI { return this.appSettingsHome; }
-
 	unsetSnapExportedVariables() {
 		if (!isLinux) {
 			return;
diff --git a/src/vs/platform/userData/common/fileUserDataProvider.ts b/src/vs/platform/userData/common/fileUserDataProvider.ts
index 539c8011f3e..9382a676acb 100644
--- a/src/vs/platform/userData/common/fileUserDataProvider.ts
+++ b/src/vs/platform/userData/common/fileUserDataProvider.ts
@@ -4,13 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 import { Event, Emitter } from 'vs/base/common/event';
 import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IFileSystemProviderWithFileReadWriteCapability, IFileChange, IWatchOptions, IStat, IFileOverwriteOptions, FileType, IFileWriteOptions, IFileDeleteOptions, FileSystemProviderCapabilities, IFileSystemProviderWithFileReadStreamCapability, IFileReadStreamOptions, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileFolderCopyCapability, hasFileFolderCopyCapability } from 'vs/platform/files/common/files';
+import { IFileSystemProviderWithFileReadWriteCapability, IFileChange, IWatchOptions, IStat, IFileOverwriteOptions, FileType, IFileWriteOptions, IFileDeleteOptions, FileSystemProviderCapabilities, IFileSystemProviderWithFileReadStreamCapability, IFileReadStreamOptions, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileFolderCopyCapability, hasFileFolderCopyCapability, hasFileAtomicWriteCapability } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { newWriteableStream, ReadableStreamEvents } from 'vs/base/common/stream';
 import { ILogService } from 'vs/platform/log/common/log';
 import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
 import { VSBuffer } from 'vs/base/common/buffer';
+import { isObject } from 'vs/base/common/types';
 
 /**
  * This is a wrapper on top of the local filesystem provider which will
@@ -85,6 +86,9 @@ export class FileUserDataProvider extends Disposable implements
 	}
 
 	writeFile(resource: URI, content: Uint8Array, opts: IFileWriteOptions): Promise<void> {
+		if (!isObject(opts.atomic) && hasFileAtomicWriteCapability(this.fileSystemProvider)) {
+			opts = { ...opts, atomic: { postfix: '.vsctmp' } };
+		}
 		return this.fileSystemProvider.writeFile(this.toFileSystemResource(resource), content, opts);
 	}
 

From 65e921c5b8e09c11fa75141a3aa33ca8cae6dbef Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 4 Sep 2023 17:36:29 +0200
Subject: [PATCH 73/94] Removes support to pass in diff algorithm via option in
 favor of a service.

Fixes https://github.com/microsoft/monaco-editor/issues/3558
---
 build/monaco/monaco.d.ts.recipe               |   4 -
 .../diffEditorWidget2/diffEditorViewModel.ts  |  26 ++-
 .../diffEditorWidget2/diffEditorWidget2.ts    |  16 +-
 .../diffProviderFactoryService.ts             |  35 ++++
 src/vs/editor/common/config/editorOptions.ts  |   3 +-
 .../common/diff/documentDiffProvider.ts       |   3 +
 .../standalone/browser/standaloneEditor.ts    |  38 ++--
 src/vs/monaco.d.ts                            | 180 +-----------------
 8 files changed, 80 insertions(+), 225 deletions(-)
 create mode 100644 src/vs/editor/browser/widget/diffEditorWidget2/diffProviderFactoryService.ts

diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index 4f064aeb6f1..759ba84e090 100644
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -108,10 +108,6 @@ export interface ICommandHandler {
 #include(vs/editor/common/core/wordHelper): IWordAtPosition
 #includeAll(vs/editor/common/model): IScrollEvent
 #include(vs/editor/common/diff/legacyLinesDiffComputer): IChange, ICharChange, ILineChange
-#include(vs/editor/common/diff/documentDiffProvider): IDocumentDiffProvider, IDocumentDiffProviderOptions, IDocumentDiff
-#include(vs/editor/common/core/lineRange): LineRange
-#include(vs/editor/common/diff/linesDiffComputer): MovedText
-#include(vs/editor/common/diff/rangeMapping): DetailedLineRangeMapping, RangeMapping, LineRangeMapping
 #include(vs/editor/common/core/dimension): IDimension
 #includeAll(vs/editor/common/editorCommon): IScrollEvent
 #includeAll(vs/editor/common/textModelEvents):
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
index 60bd6f8cba8..da024fec498 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts
@@ -7,10 +7,12 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IObservable, IReader, ISettableObservable, ITransaction, autorunWithStore, derived, observableSignal, observableSignalFromEvent, observableValue, transaction, waitForState } from 'vs/base/common/observable';
+import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
+import { IDiffProviderFactoryService } from 'vs/editor/browser/widget/diffEditorWidget2/diffProviderFactoryService';
 import { readHotReloadableExport } from 'vs/editor/browser/widget/diffEditorWidget2/utils';
 import { ISerializedLineRange, LineRange } from 'vs/editor/common/core/lineRange';
 import { DefaultLinesDiffComputer } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
-import { IDocumentDiff, IDocumentDiffProvider } from 'vs/editor/common/diff/documentDiffProvider';
+import { IDocumentDiff } from 'vs/editor/common/diff/documentDiffProvider';
 import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
 import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { IDiffEditorModel, IDiffEditorViewModel } from 'vs/editor/common/editorCommon';
@@ -64,10 +66,22 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 
 	private readonly _cancellationTokenSource = new CancellationTokenSource();
 
+	private readonly _diffProvider = derived(this, reader => {
+		const diffProvider = this._diffProviderFactoryService.createDiffProvider(this._editor, {
+			diffAlgorithm: this._options.diffAlgorithm.read(reader)
+		});
+		const onChangeSignal = observableSignalFromEvent('onDidChange', diffProvider.onDidChange);
+		return {
+			diffProvider,
+			onChangeSignal,
+		};
+	});
+
 	constructor(
 		public readonly model: IDiffEditorModel,
 		private readonly _options: DiffEditorOptions,
-		documentDiffProvider: IDocumentDiffProvider,
+		private readonly _editor: IDiffEditor,
+		@IDiffProviderFactoryService private readonly _diffProviderFactoryService: IDiffProviderFactoryService,
 	) {
 		super();
 
@@ -162,8 +176,6 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 			debouncer.schedule();
 		}));
 
-		const documentDiffProviderOptionChanged = observableSignalFromEvent('documentDiffProviderOptionChanged', documentDiffProvider.onDidChange);
-
 		this._register(autorunWithStore(async (reader, store) => {
 			/** @description compute diff */
 
@@ -173,7 +185,9 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 
 			debouncer.cancel();
 			contentChangedSignal.read(reader);
-			documentDiffProviderOptionChanged.read(reader);
+			const documentDiffProvider = this._diffProvider.read(reader);
+			documentDiffProvider.onChangeSignal.read(reader);
+
 			readHotReloadableExport(DefaultLinesDiffComputer, reader);
 
 			this._isDiffUpToDate.set(false, undefined);
@@ -190,7 +204,7 @@ export class DiffEditorViewModel extends Disposable implements IDiffEditorViewMo
 				modifiedTextEditInfos = combineTextEditInfos(modifiedTextEditInfos, edits);
 			}));
 
-			let result = await documentDiffProvider.computeDiff(model.original, model.modified, {
+			let result = await documentDiffProvider.diffProvider.computeDiff(model.original, model.modified, {
 				ignoreTrimWhitespace: this._options.ignoreTrimWhitespace.read(reader),
 				maxComputationTimeMs: this._options.maxComputationTimeMs.read(reader),
 				computeMoves: this._options.showMoves.read(reader),
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
index 6ad55e44773..e899a379f99 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
@@ -7,6 +7,7 @@ import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
 import { findLast } from 'vs/base/common/arrays';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Event } from 'vs/base/common/event';
+import { toDisposable } from 'vs/base/common/lifecycle';
 import { IObservable, autorun, autorunWithStore, derived, derivedWithStore, disposableObservableValue, recomputeInitiallyAndOnChange, observableValue, transaction } from 'vs/base/common/observable';
 import 'vs/css!./style';
 import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
@@ -18,19 +19,18 @@ import { IDiffCodeEditorWidgetOptions } from 'vs/editor/browser/widget/diffEdito
 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';
+import { HideUnchangedRegionsFeature } from 'vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature';
 import { ViewZoneManager } from 'vs/editor/browser/widget/diffEditorWidget2/lineAlignment';
 import { MovedBlocksLinesPart } from 'vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines';
 import { OverviewRulerPart } from 'vs/editor/browser/widget/diffEditorWidget2/overviewRulerPart';
-import { HideUnchangedRegionsFeature } from 'vs/editor/browser/widget/diffEditorWidget2/hideUnchangedRegionsFeature';
 import { CSSStyle, ObservableElementSizeObserver, applyStyle, readHotReloadableExport } from 'vs/editor/browser/widget/diffEditorWidget2/utils';
-import { WorkerBasedDocumentDiffProvider } from 'vs/editor/browser/widget/workerBasedDocumentDiffProvider';
 import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IDimension } from 'vs/editor/common/core/dimension';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { IDiffComputationResult, ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
+import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { EditorType, IDiffEditorModel, IDiffEditorViewModel, IDiffEditorViewState } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
@@ -39,13 +39,12 @@ import { AudioCue, IAudioCueService } from 'vs/platform/audioCues/browser/audioC
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IEditorProgressService } from 'vs/platform/progress/common/progress';
 import './colors';
 import { DelegatingEditor } from './delegatingEditorImpl';
 import { DiffEditorEditors } from './diffEditorEditors';
 import { DiffEditorOptions } from './diffEditorOptions';
 import { DiffEditorViewModel, DiffMapping, DiffState } from './diffEditorViewModel';
-import { toDisposable } from 'vs/base/common/lifecycle';
-import { IEditorProgressService } from 'vs/platform/progress/common/progress';
 
 export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 	private readonly elements = h('div.monaco-diff-editor.side-by-side', { style: { position: 'relative', height: '100%' } }, [
@@ -366,12 +365,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
 	}
 
 	public createViewModel(model: IDiffEditorModel): IDiffEditorViewModel {
-		return new DiffEditorViewModel(
-			model,
-			this._options,
-			// TODO@hediet make diffAlgorithm observable
-			this._instantiationService.createInstance(WorkerBasedDocumentDiffProvider, { diffAlgorithm: this._options.diffAlgorithm.get() })
-		);
+		return this._instantiationService.createInstance(DiffEditorViewModel, model, this._options, this);
 	}
 
 	override getModel(): IDiffEditorModel | null { return this._diffModel.get()?.model ?? null; }
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffProviderFactoryService.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffProviderFactoryService.ts
new file mode 100644
index 00000000000..fd7bb19ac4b
--- /dev/null
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffProviderFactoryService.ts
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
+import { WorkerBasedDocumentDiffProvider } from 'vs/editor/browser/widget/workerBasedDocumentDiffProvider';
+import { IDocumentDiffProvider } from 'vs/editor/common/diff/documentDiffProvider';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const IDiffProviderFactoryService = createDecorator<IDiffProviderFactoryService>('diffProviderFactoryService');
+
+export interface IDocumentDiffProviderOptions {
+	readonly diffAlgorithm?: 'legacy' | 'advanced';
+}
+
+export interface IDiffProviderFactoryService {
+	readonly _serviceBrand: undefined;
+	createDiffProvider(editor: IDiffEditor, options: IDocumentDiffProviderOptions): IDocumentDiffProvider;
+}
+
+export class DiffProviderFactoryService implements IDiffProviderFactoryService {
+	readonly _serviceBrand: undefined;
+
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) { }
+
+	createDiffProvider(editor: IDiffEditor, options: IDocumentDiffProviderOptions): IDocumentDiffProvider {
+		return this.instantiationService.createInstance(WorkerBasedDocumentDiffProvider, options);
+	}
+}
+
+registerSingleton(IDiffProviderFactoryService, DiffProviderFactoryService, InstantiationType.Delayed);
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 35979acc29f..1604747fdb9 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -13,7 +13,6 @@ import { Constants } from 'vs/base/common/uint';
 import { FontInfo } from 'vs/editor/common/config/fontInfo';
 import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/core/textModelDefaults';
 import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/core/wordHelper';
-import { IDocumentDiffProvider } from 'vs/editor/common/diff/documentDiffProvider';
 import * as nls from 'vs/nls';
 import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
 import { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
@@ -817,7 +816,7 @@ export interface IDiffEditorBaseOptions {
 	/**
 	 * Diff Algorithm
 	*/
-	diffAlgorithm?: 'legacy' | 'advanced' | IDocumentDiffProvider;
+	diffAlgorithm?: 'legacy' | 'advanced';
 
 	/**
 	 * Whether the diff editor aria label should be verbose.
diff --git a/src/vs/editor/common/diff/documentDiffProvider.ts b/src/vs/editor/common/diff/documentDiffProvider.ts
index 44accf9e604..10dfca90888 100644
--- a/src/vs/editor/common/diff/documentDiffProvider.ts
+++ b/src/vs/editor/common/diff/documentDiffProvider.ts
@@ -11,6 +11,7 @@ import { ITextModel } from 'vs/editor/common/model';
 
 /**
  * A document diff provider computes the diff between two text models.
+ * @internal
  */
 export interface IDocumentDiffProvider {
 	/**
@@ -27,6 +28,7 @@ export interface IDocumentDiffProvider {
 
 /**
  * Options for the diff computation.
+ * @internal
  */
 export interface IDocumentDiffProviderOptions {
 	/**
@@ -47,6 +49,7 @@ export interface IDocumentDiffProviderOptions {
 
 /**
  * Represents a diff between two text models.
+ * @internal
  */
 export interface IDocumentDiff {
 	/**
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index 9d529b71049..8f8caf549a3 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -3,45 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./standalone-tokens';
 import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { splitLines } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
+import 'vs/css!./standalone-tokens';
 import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
 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';
+import { IPosition } from 'vs/editor/common/core/position';
+import { IRange } from 'vs/editor/common/core/range';
 import { EditorType, IDiffEditor } from 'vs/editor/common/editorCommon';
-import { FindMatch, ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
 import * as languages from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { NullState, nullTokenize } from 'vs/editor/common/languages/nullTokenize';
 import { ILanguageService } from 'vs/editor/common/languages/language';
+import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
+import { NullState, nullTokenize } from 'vs/editor/common/languages/nullTokenize';
+import { FindMatch, ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/model';
-import { createWebWorker as actualCreateWebWorker, IWebWorkerOptions, MonacoWebWorker } from 'vs/editor/browser/services/webWorker';
 import * as standaloneEnums from 'vs/editor/common/standalone/standaloneEnums';
 import { Colorizer, IColorizerElementOptions, IColorizerOptions } from 'vs/editor/standalone/browser/colorizer';
-import { createTextModel, IActionDescriptor, IStandaloneCodeEditor, IStandaloneDiffEditor, IStandaloneDiffEditorConstructionOptions, IStandaloneEditorConstructionOptions, StandaloneDiffEditor, StandaloneDiffEditor2, StandaloneEditor } from 'vs/editor/standalone/browser/standaloneCodeEditor';
+import { IActionDescriptor, IStandaloneCodeEditor, IStandaloneDiffEditor, IStandaloneDiffEditorConstructionOptions, IStandaloneEditorConstructionOptions, StandaloneDiffEditor, 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';
+import { IMenuItem, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
-import { IMarker, IMarkerData, IMarkerService } from 'vs/platform/markers/common/markers';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { EditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { IMenuItem, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
-import { DetailedLineRangeMapping, RangeMapping, LineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { LineRange } from 'vs/editor/common/core/lineRange';
-import { EditorZoom } from 'vs/editor/common/config/editorZoom';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IRange } from 'vs/editor/common/core/range';
-import { IPosition } from 'vs/editor/common/core/position';
 import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IMarker, IMarkerData, IMarkerService } from 'vs/platform/markers/common/markers';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
 
 /**
  * Create a new editor under `domElement`.
@@ -584,12 +581,7 @@ export function createMonacoEditorAPI(): typeof monaco.editor {
 		TextModelResolvedOptions: <any>TextModelResolvedOptions,
 		FindMatch: <any>FindMatch,
 		ApplyUpdateResult: <any>ApplyUpdateResult,
-		LineRange: <any>LineRange,
-		DetailedLineRangeMapping: <any>DetailedLineRangeMapping,
-		RangeMapping: <any>RangeMapping,
 		EditorZoom: <any>EditorZoom,
-		MovedText: <any>MovedText,
-		LineRangeMapping: <any>LineRangeMapping,
 
 		// vars
 		EditorType: EditorType,
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index b6519772cc2..168b46965be 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -2366,184 +2366,6 @@ declare namespace monaco.editor {
 	export interface ILineChange extends IChange {
 		readonly charChanges: ICharChange[] | undefined;
 	}
-
-	/**
-	 * A document diff provider computes the diff between two text models.
-	 */
-	export interface IDocumentDiffProvider {
-		/**
-		 * Computes the diff between the text models `original` and `modified`.
-		 */
-		computeDiff(original: ITextModel, modified: ITextModel, options: IDocumentDiffProviderOptions, cancellationToken: CancellationToken): Promise<IDocumentDiff>;
-		/**
-		 * Is fired when settings of the diff algorithm change that could alter the result of the diffing computation.
-		 * Any user of this provider should recompute the diff when this event is fired.
-		 */
-		onDidChange: IEvent<void>;
-	}
-
-	/**
-	 * Options for the diff computation.
-	 */
-	export interface IDocumentDiffProviderOptions {
-		/**
-		 * When set to true, the diff should ignore whitespace changes.
-		 */
-		ignoreTrimWhitespace: boolean;
-		/**
-		 * A diff computation should throw if it takes longer than this value.
-		 */
-		maxComputationTimeMs: number;
-		/**
-		 * If set, the diff computation should compute moves in addition to insertions and deletions.
-		 */
-		computeMoves: boolean;
-	}
-
-	/**
-	 * Represents a diff between two text models.
-	 */
-	export interface IDocumentDiff {
-		/**
-		 * If true, both text models are identical (byte-wise).
-		 */
-		readonly identical: boolean;
-		/**
-		 * If true, the diff computation timed out and the diff might not be accurate.
-		 */
-		readonly quitEarly: boolean;
-		/**
-		 * Maps all modified line ranges in the original to the corresponding line ranges in the modified text model.
-		 */
-		readonly changes: readonly DetailedLineRangeMapping[];
-		/**
-		 * Sorted by original line ranges.
-		 * The original line ranges and the modified line ranges must be disjoint (but can be touching).
-		 */
-		readonly moves: readonly MovedText[];
-	}
-
-	/**
-	 * A range of lines (1-based).
-	 */
-	export class LineRange {
-		static fromRange(range: Range): LineRange;
-		static subtract(a: LineRange, b: LineRange | undefined): LineRange[];
-		/**
-		 * @param lineRanges An array of sorted line ranges.
-		 */
-		static joinMany(lineRanges: readonly (readonly LineRange[])[]): readonly LineRange[];
-		static ofLength(startLineNumber: number, length: number): LineRange;
-		/**
-		 * The start line number.
-		 */
-		readonly startLineNumber: number;
-		/**
-		 * The end line number (exclusive).
-		 */
-		readonly endLineNumberExclusive: number;
-		constructor(startLineNumber: number, endLineNumberExclusive: number);
-		/**
-		 * Indicates if this line range contains the given line number.
-		 */
-		contains(lineNumber: number): boolean;
-		/**
-		 * Indicates if this line range is empty.
-		 */
-		get isEmpty(): boolean;
-		/**
-		 * Moves this line range by the given offset of line numbers.
-		 */
-		delta(offset: number): LineRange;
-		deltaLength(offset: number): LineRange;
-		/**
-		 * The number of lines this line range spans.
-		 */
-		get length(): number;
-		/**
-		 * Creates a line range that combines this and the given line range.
-		 */
-		join(other: LineRange): LineRange;
-		toString(): string;
-		/**
-		 * The resulting range is empty if the ranges do not intersect, but touch.
-		 * If the ranges don't even touch, the result is undefined.
-		 */
-		intersect(other: LineRange): LineRange | undefined;
-		intersectsStrict(other: LineRange): boolean;
-		overlapOrTouch(other: LineRange): boolean;
-		equals(b: LineRange): boolean;
-		toInclusiveRange(): Range | null;
-		toExclusiveRange(): Range;
-		mapToLineArray<T>(f: (lineNumber: number) => T): T[];
-		forEach(f: (lineNumber: number) => void): void;
-		includes(lineNumber: number): boolean;
-	}
-
-	export class MovedText {
-		readonly lineRangeMapping: LineRangeMapping;
-		/**
-		 * The diff from the original text to the moved text.
-		 * Must be contained in the original/modified line range.
-		 * Can be empty if the text didn't change (only moved).
-		 */
-		readonly changes: readonly DetailedLineRangeMapping[];
-		constructor(lineRangeMapping: LineRangeMapping, changes: readonly DetailedLineRangeMapping[]);
-		flip(): MovedText;
-	}
-
-	/**
-	 * Maps a line range in the original text model to a line range in the modified text model.
-	 * Also contains inner range mappings.
-	 */
-	export class DetailedLineRangeMapping extends LineRangeMapping {
-		/**
-		 * If inner changes have not been computed, this is set to undefined.
-		 * Otherwise, it represents the character-level diff in this line range.
-		 * The original range of each range mapping should be contained in the original line range (same for modified), exceptions are new-lines.
-		 * Must not be an empty array.
-		 */
-		readonly innerChanges: RangeMapping[] | undefined;
-		constructor(originalRange: LineRange, modifiedRange: LineRange, innerChanges: RangeMapping[] | undefined);
-		flip(): DetailedLineRangeMapping;
-	}
-
-	/**
-	 * Maps a range in the original text model to a range in the modified text model.
-	 */
-	export class RangeMapping {
-		/**
-		 * The original range.
-		 */
-		readonly originalRange: Range;
-		/**
-		 * The modified range.
-		 */
-		readonly modifiedRange: Range;
-		constructor(originalRange: Range, modifiedRange: Range);
-		toString(): string;
-		flip(): RangeMapping;
-	}
-
-	/**
-	 * Maps a line range in the original text model to a line range in the modified text model.
-	 */
-	export class LineRangeMapping {
-		static inverse(mapping: readonly DetailedLineRangeMapping[], originalLineCount: number, modifiedLineCount: number): DetailedLineRangeMapping[];
-		/**
-		 * The line range in the original text model.
-		 */
-		readonly original: LineRange;
-		/**
-		 * The line range in the modified text model.
-		 */
-		readonly modified: LineRange;
-		constructor(originalRange: LineRange, modifiedRange: LineRange);
-		toString(): string;
-		flip(): LineRangeMapping;
-		join(other: LineRangeMapping): LineRangeMapping;
-		get changedLineCount(): any;
-	}
 	export interface IDimension {
 		width: number;
 		height: number;
@@ -3966,7 +3788,7 @@ declare namespace monaco.editor {
 		/**
 		 * Diff Algorithm
 		*/
-		diffAlgorithm?: 'legacy' | 'advanced' | IDocumentDiffProvider;
+		diffAlgorithm?: 'legacy' | 'advanced';
 		/**
 		 * Whether the diff editor aria label should be verbose.
 		 */

From 3159fa24938a12834509471179a48bb3df1da2f6 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Mon, 4 Sep 2023 18:26:25 +0200
Subject: [PATCH 74/94] update playwright

---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 4a0405868b6..2814401b7f9 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "yazl": "^2.4.3"
   },
   "devDependencies": {
-    "@playwright/test": "^1.34.3",
+    "@playwright/test": "^1.37.1",
     "@swc/cli": "0.1.62",
     "@swc/core": "1.3.62",
     "@types/cookie": "^0.3.3",
diff --git a/yarn.lock b/yarn.lock
index e2a9ec02d7b..c49176e5cb6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -682,13 +682,13 @@
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
 
-"@playwright/test@^1.34.3":
-  version "1.34.3"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.34.3.tgz#d9f1ac3f1a09633b5ca5351c50c308bf802bde53"
-  integrity sha512-zPLef6w9P6T/iT6XDYG3mvGOqOyb6eHaV9XtkunYs0+OzxBtrPAAaHotc0X+PJ00WPPnLfFBTl7mf45Mn8DBmw==
+"@playwright/test@^1.37.1":
+  version "1.37.1"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.37.1.tgz#e7f44ae0faf1be52d6360c6bbf689fd0057d9b6f"
+  integrity sha512-bq9zTli3vWJo8S3LwB91U0qDNQDpEXnw7knhxLM0nwDvexQAwx9tO8iKDZSqqneVq+URd/WIoz+BALMqUTgdSg==
   dependencies:
     "@types/node" "*"
-    playwright-core "1.34.3"
+    playwright-core "1.37.1"
   optionalDependencies:
     fsevents "2.3.2"
 
@@ -7827,10 +7827,10 @@ playwright-core@1.32.2:
   resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.32.2.tgz#608810c3c4486fb86a224732ac0d3560a96ded8b"
   integrity sha512-zD7aonO+07kOTthsrCR3YCVnDcqSHIJpdFUtZEMOb6//1Rc7/6mZDRdw+nlzcQiQltOOsiqI3rrSyn/SlyjnJQ==
 
-playwright-core@1.34.3:
-  version "1.34.3"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.34.3.tgz#bc906ea1b26bb66116ce329436ee59ba2e78fe9f"
-  integrity sha512-2pWd6G7OHKemc5x1r1rp8aQcpvDh7goMBZlJv6Co5vCNLVcQJdhxRL09SGaY6HcyHH9aT4tiynZabMofVasBYw==
+playwright-core@1.37.1:
+  version "1.37.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.37.1.tgz#cb517d52e2e8cb4fa71957639f1cd105d1683126"
+  integrity sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA==
 
 playwright@^1.29.2:
   version "1.30.0"

From a10be9fb4cf30bb1f69033e241ee65c689a9746c Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Mon, 4 Sep 2023 18:26:57 +0200
Subject: [PATCH 75/94] skip `smart diff consistency` because it fails on
 webkit and causes other tests to fail...

---
 src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
index 9ae0e08b0f1..6b60b35aef6 100644
--- a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
+++ b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
@@ -380,7 +380,7 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[5].depth, 1);
 	}));
 
-	test('smart diff consistency', () => {
+	test.skip('smart diff consistency', () => {
 		const times = 500;
 		const minEdits = 1;
 		const maxEdits = 10;

From b9e4141833a7b88776c4eba83f1e835a7f58604f Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 4 Sep 2023 20:43:33 +0200
Subject: [PATCH 76/94] Revert "Remove superfluous arg in git smoke.test.ts
 (#173194)" (#192161)

This reverts commit 9dd556a9e06a6f9b5d7e734fea9ec00d34071a63.
---
 extensions/git/src/test/smoke.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/git/src/test/smoke.test.ts b/extensions/git/src/test/smoke.test.ts
index b0070eb127f..789086e90a4 100644
--- a/extensions/git/src/test/smoke.test.ts
+++ b/extensions/git/src/test/smoke.test.ts
@@ -122,7 +122,7 @@ suite('git smoke test', function () {
 		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.path && r.status === Status.UNTRACKED);
 		assert.strictEqual(repository.state.indexChanges.length, 0);
 
-		await commands.executeCommand('git.stageAll');
+		await commands.executeCommand('git.stageAll', appjs);
 		await repository.commit('third commit');
 		assert.strictEqual(repository.state.workingTreeChanges.length, 0);
 		assert.strictEqual(repository.state.indexChanges.length, 0);

From e0e970f76bc3746d159cefaef3b02b7ce7e18cb7 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 4 Sep 2023 22:45:27 +0200
Subject: [PATCH 77/94] Removes legacy diff editor. (#191989)

* Removes legacy diff editor.

* Fixes CI

* Fixes CI
---
 .vscode/settings.json                         |    1 -
 build/monaco/monaco.d.ts.recipe               |    1 -
 .../editor/browser/widget/diffEditorWidget.ts | 2802 -----------------
 .../diffEditorWidget2/accessibleDiffViewer.ts |   12 +-
 .../diffEditorWidget2/diffEditorEditors.ts    |    2 +-
 .../diffEditorWidget2/diffEditorWidget2.ts    |   12 +-
 .../widget/diffEditorWidget2/renderLines.ts   |    4 +-
 src/vs/editor/browser/widget/diffNavigator.ts |  278 --
 src/vs/editor/browser/widget/diffReview.ts    |  826 -----
 .../widget/embeddedCodeEditorWidget.ts        |   63 +-
 .../config/editorConfigurationSchema.ts       |   16 +-
 src/vs/editor/editor.all.ts                   |    3 +-
 .../browser/standaloneCodeEditor.ts           |   77 -
 .../standalone/browser/standaloneEditor.ts    |   20 +-
 src/vs/monaco.d.ts                            |   15 -
 .../browser/parts/editor/textDiffEditor.ts    |   22 +-
 .../codeEditor/browser/diffEditorHelper.ts    |    4 +-
 .../notebook/browser/diff/diffComponents.ts   |   16 +-
 .../browser/diff/diffElementViewModel.ts      |    6 +-
 .../browser/diff/notebookDiffEditorBrowser.ts |    4 +-
 .../notebook/browser/diff/notebookDiffList.ts |    4 +-
 .../contrib/scm/browser/dirtydiffDecorator.ts |    8 +-
 22 files changed, 57 insertions(+), 4139 deletions(-)
 delete mode 100644 src/vs/editor/browser/widget/diffEditorWidget.ts
 delete mode 100644 src/vs/editor/browser/widget/diffNavigator.ts
 delete mode 100644 src/vs/editor/browser/widget/diffReview.ts

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7eefe0c57f6..6925e3ed8c6 100644
--- 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,
 }
diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index 759ba84e090..55efbe60085 100644
--- 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
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
deleted file mode 100644
index 47dba6865b7..00000000000
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ /dev/null
@@ -1,2802 +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 { createFastDomNode, FastDomNode } from 'vs/base/browser/fastDomNode';
-import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
-import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
-import { IBoundarySashes, ISashEvent, IVerticalSashLayoutProvider, Orientation, Sash, SashState } from 'vs/base/browser/ui/sash/sash';
-import * as assert from 'vs/base/common/assert';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Codicon } from 'vs/base/common/codicons';
-import { Color } from 'vs/base/common/color';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { Constants } from 'vs/base/common/uint';
-import { URI } from 'vs/base/common/uri';
-import 'vs/css!./media/diffEditor';
-import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { ElementSizeObserver } from 'vs/editor/browser/config/elementSizeObserver';
-import * as editorBrowser from 'vs/editor/browser/editorBrowser';
-import { EditorExtensionsRegistry, IDiffEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
-import { DiffNavigator } from 'vs/editor/browser/widget/diffNavigator';
-import { DiffReview } from 'vs/editor/browser/widget/diffReview';
-import { IDiffLinesChange, InlineDiffMargin } from 'vs/editor/browser/widget/inlineDiffMargin';
-import { WorkerBasedDocumentDiffProvider } from 'vs/editor/browser/widget/workerBasedDocumentDiffProvider';
-import { clampedFloat, clampedInt, EditorFontLigatures, EditorLayoutInfo, EditorOption, EditorOptions, IDiffEditorOptions, boolean as validateBooleanOption, stringSet as validateStringSetOption, ValidDiffEditorBaseOptions } from 'vs/editor/common/config/editorOptions';
-import { FontInfo } from 'vs/editor/common/config/fontInfo';
-import { IDimension } from 'vs/editor/common/core/dimension';
-import { IPosition, Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
-import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { IChange, ICharChange, IDiffComputationResult, ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { ILineBreaksComputer } from 'vs/editor/common/modelLineProjectionData';
-import { IViewLineTokens } from 'vs/editor/common/tokens/lineTokens';
-import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { RenderLineInput, renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
-import { IEditorWhitespace, InlineDecoration, InlineDecorationType, IViewModel, ViewLineRenderingData } from 'vs/editor/common/viewModel';
-import { OverviewRulerZone } from 'vs/editor/common/viewModel/overviewZoneManager';
-import * as nls from 'vs/nls';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IEditorProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
-import { defaultInsertColor, defaultRemoveColor, diffDiagonalFill, diffInserted, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved } from 'vs/platform/theme/common/colorRegistry';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { getThemeTypeSelector, IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-
-export interface IDiffCodeEditorWidgetOptions {
-	originalEditor?: ICodeEditorWidgetOptions;
-	modifiedEditor?: ICodeEditorWidgetOptions;
-}
-
-interface IEditorDiffDecorations {
-	decorations: IModelDeltaDecoration[];
-	overviewZones: OverviewRulerZone[];
-}
-
-interface IEditorDiffDecorationsWithZones extends IEditorDiffDecorations {
-	zones: IMyViewZone[];
-}
-
-interface IEditorsDiffDecorationsWithZones {
-	original: IEditorDiffDecorationsWithZones;
-	modified: IEditorDiffDecorationsWithZones;
-}
-
-interface IEditorsZones {
-	original: IMyViewZone[];
-	modified: IMyViewZone[];
-}
-
-class VisualEditorState {
-	private _zones: string[];
-	private _inlineDiffMargins: InlineDiffMargin[];
-	private _zonesMap: { [zoneId: string]: boolean };
-	private _decorations: string[];
-
-	constructor(
-		private _contextMenuService: IContextMenuService,
-		private _clipboardService: IClipboardService
-	) {
-		this._zones = [];
-		this._inlineDiffMargins = [];
-		this._zonesMap = {};
-		this._decorations = [];
-	}
-
-	public getForeignViewZones(allViewZones: IEditorWhitespace[]): IEditorWhitespace[] {
-		return allViewZones.filter((z) => !this._zonesMap[String(z.id)]);
-	}
-
-	public clean(editor: CodeEditorWidget): void {
-		// (1) View zones
-		if (this._zones.length > 0) {
-			editor.changeViewZones((viewChangeAccessor: editorBrowser.IViewZoneChangeAccessor) => {
-				for (const zoneId of this._zones) {
-					viewChangeAccessor.removeZone(zoneId);
-				}
-			});
-		}
-		this._zones = [];
-		this._zonesMap = {};
-
-		// (2) Model decorations
-		editor.changeDecorations((changeAccessor) => {
-			this._decorations = changeAccessor.deltaDecorations(this._decorations, []);
-		});
-	}
-
-	public apply(editor: CodeEditorWidget, overviewRuler: editorBrowser.IOverviewRuler | null, newDecorations: IEditorDiffDecorationsWithZones, restoreScrollState: boolean): void {
-
-		const scrollState = restoreScrollState ? StableEditorScrollState.capture(editor) : null;
-
-		// view zones
-		editor.changeViewZones((viewChangeAccessor: editorBrowser.IViewZoneChangeAccessor) => {
-			for (const zoneId of this._zones) {
-				viewChangeAccessor.removeZone(zoneId);
-			}
-			for (const inlineDiffMargin of this._inlineDiffMargins) {
-				inlineDiffMargin.dispose();
-			}
-			this._zones = [];
-			this._zonesMap = {};
-			this._inlineDiffMargins = [];
-			for (let i = 0, length = newDecorations.zones.length; i < length; i++) {
-				const viewZone = <editorBrowser.IViewZone>newDecorations.zones[i];
-				viewZone.suppressMouseDown = true;
-				viewZone.showInHiddenAreas = true;
-				const zoneId = viewChangeAccessor.addZone(viewZone);
-				this._zones.push(zoneId);
-				this._zonesMap[String(zoneId)] = true;
-
-				if (newDecorations.zones[i].diff && viewZone.marginDomNode) {
-					viewZone.suppressMouseDown = false;
-					if (newDecorations.zones[i].diff?.originalModel.getValueLength() !== 0) {
-						// do not contribute diff margin actions for newly created files
-						this._inlineDiffMargins.push(new InlineDiffMargin(zoneId, viewZone.marginDomNode, editor, newDecorations.zones[i].diff!, this._contextMenuService, this._clipboardService));
-					}
-				}
-			}
-		});
-
-		scrollState?.restore(editor);
-
-		// decorations
-		editor.changeDecorations((changeAccessor) => {
-			this._decorations = changeAccessor.deltaDecorations(this._decorations, newDecorations.decorations);
-		});
-
-		// overview ruler
-		overviewRuler?.setZones(newDecorations.overviewZones);
-	}
-}
-
-let DIFF_EDITOR_ID = 0;
-
-
-const diffInsertIcon = registerIcon('diff-insert', Codicon.add, nls.localize('diffInsertIcon', 'Line decoration for inserts in the diff editor.'));
-const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, nls.localize('diffRemoveIcon', 'Line decoration for removals in the diff editor.'));
-export const diffEditorWidgetTtPolicy = createTrustedTypesPolicy('diffEditorWidget', { createHTML: value => value });
-
-const ariaNavigationTip = nls.localize('diff-aria-navigation-tip', ' use Shift + F7 to navigate changes');
-
-export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffEditor {
-
-	private static readonly ONE_OVERVIEW_WIDTH = 15;
-	public static readonly ENTIRE_DIFF_OVERVIEW_WIDTH = 30;
-	private static readonly UPDATE_DIFF_DECORATIONS_DELAY = 200; // ms
-
-	private readonly _onDidDispose: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onDidDispose: Event<void> = this._onDidDispose.event;
-
-	protected readonly _onDidChangeModel: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onDidChangeModel: Event<void> = this._onDidChangeModel.event;
-
-	private readonly _onDidUpdateDiff: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onDidUpdateDiff: Event<void> = this._onDidUpdateDiff.event;
-
-	private readonly _onDidContentSizeChange: Emitter<editorCommon.IContentSizeChangedEvent> = this._register(new Emitter<editorCommon.IContentSizeChangedEvent>());
-	public readonly onDidContentSizeChange: Event<editorCommon.IContentSizeChangedEvent> = this._onDidContentSizeChange.event;
-
-	private readonly _id: number;
-	private _state: editorBrowser.DiffEditorState;
-	private _updatingDiffProgress: IProgressRunner | null;
-
-	private readonly _domElement: HTMLElement;
-	protected readonly _containerDomElement: HTMLElement;
-	private readonly _overviewDomElement: HTMLElement;
-	private readonly _overviewViewportDomElement: FastDomNode<HTMLElement>;
-
-	private readonly _elementSizeObserver: ElementSizeObserver;
-
-	private readonly _originalEditor: CodeEditorWidget;
-	private readonly _originalDomNode: HTMLElement;
-	private readonly _originalEditorState: VisualEditorState;
-	private _originalOverviewRuler: editorBrowser.IOverviewRuler | null;
-
-	private readonly _modifiedEditor: CodeEditorWidget;
-	private readonly _modifiedDomNode: HTMLElement;
-	private readonly _modifiedEditorState: VisualEditorState;
-	private _modifiedOverviewRuler: editorBrowser.IOverviewRuler | null;
-
-	private _currentlyChangingViewZones: boolean;
-	private _beginUpdateDecorationsTimeout: number;
-	private _diffComputationToken: number;
-	private _diffComputationResult: IDiffComputationResult | null;
-
-	private _isVisible: boolean;
-	private _isHandlingScrollEvent: boolean;
-
-	private _boundarySashes: IBoundarySashes | undefined;
-
-	private _options: ValidDiffEditorBaseOptions;
-
-	private _strategy!: DiffEditorWidgetStyle;
-
-	private readonly _updateDecorationsRunner: RunOnceScheduler;
-
-	private readonly _documentDiffProvider: WorkerBasedDocumentDiffProvider;
-	private readonly _contextKeyService: IContextKeyService;
-	private readonly _instantiationService: IInstantiationService;
-	private readonly _codeEditorService: ICodeEditorService;
-	private readonly _themeService: IThemeService;
-	private readonly _notificationService: INotificationService;
-
-	private readonly _reviewPane: DiffReview;
-
-	private isEmbeddedDiffEditorKey: IContextKey<boolean>;
-
-	private _diffNavigator: DiffNavigator | undefined;
-
-	constructor(
-		domElement: HTMLElement,
-		options: Readonly<editorBrowser.IDiffEditorConstructionOptions>,
-		codeEditorWidgetOptions: IDiffCodeEditorWidgetOptions,
-		@IClipboardService clipboardService: IClipboardService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@ICodeEditorService codeEditorService: ICodeEditorService,
-		@IThemeService themeService: IThemeService,
-		@INotificationService notificationService: INotificationService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IEditorProgressService private readonly _editorProgressService: IEditorProgressService
-	) {
-		super();
-		codeEditorService.willCreateDiffEditor();
-
-		this._documentDiffProvider = this._register(instantiationService.createInstance(WorkerBasedDocumentDiffProvider, options));
-		this._register(this._documentDiffProvider.onDidChange(e => this._beginUpdateDecorationsSoon()));
-
-		this._codeEditorService = codeEditorService;
-		this._contextKeyService = this._register(contextKeyService.createScoped(domElement));
-		this._instantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService]));
-		this._contextKeyService.createKey('isInDiffEditor', true);
-		this._themeService = themeService;
-		this._notificationService = notificationService;
-
-		this._id = (++DIFF_EDITOR_ID);
-		this._state = editorBrowser.DiffEditorState.Idle;
-		this._updatingDiffProgress = null;
-
-		this._domElement = domElement;
-		options = options || {};
-
-		this._options = validateDiffEditorOptions(options, {
-			enableSplitViewResizing: true,
-			splitViewDefaultRatio: 0.5,
-			renderSideBySide: true,
-			renderMarginRevertIcon: true,
-			maxComputationTime: 5000,
-			maxFileSize: 50,
-			ignoreTrimWhitespace: true,
-			renderIndicators: true,
-			originalEditable: false,
-			diffCodeLens: false,
-			renderOverviewRuler: true,
-			diffWordWrap: 'inherit',
-			diffAlgorithm: 'advanced',
-			accessibilityVerbose: false,
-			experimental: {
-				showEmptyDecorations: false,
-				showMoves: false,
-			},
-			hideUnchangedRegions: {
-				enabled: false,
-				contextLineCount: 0,
-				minimumLineCount: 0,
-				revealLineCount: 0,
-			},
-			isInEmbeddedEditor: false,
-			onlyShowAccessibleDiffViewer: false,
-			renderSideBySideInlineBreakpoint: 0,
-			useInlineViewWhenSpaceIsLimited: false,
-		});
-
-		this.isEmbeddedDiffEditorKey = EditorContextKeys.isEmbeddedDiffEditor.bindTo(this._contextKeyService);
-		this.isEmbeddedDiffEditorKey.set(typeof options.isInEmbeddedEditor !== 'undefined' ? options.isInEmbeddedEditor : false);
-		this._updateDecorationsRunner = this._register(new RunOnceScheduler(() => this._updateDecorations(), 0));
-
-		this._containerDomElement = document.createElement('div');
-		this._containerDomElement.className = DiffEditorWidget._getClassName(this._themeService.getColorTheme(), this._options.renderSideBySide);
-		this._containerDomElement.style.position = 'relative';
-		this._containerDomElement.style.height = '100%';
-		this._domElement.appendChild(this._containerDomElement);
-
-		this._overviewViewportDomElement = createFastDomNode(document.createElement('div'));
-		this._overviewViewportDomElement.setClassName('diffViewport');
-		this._overviewViewportDomElement.setPosition('absolute');
-
-		this._overviewDomElement = document.createElement('div');
-		this._overviewDomElement.className = 'diffOverview';
-		this._overviewDomElement.style.position = 'absolute';
-
-		this._overviewDomElement.appendChild(this._overviewViewportDomElement.domNode);
-
-		this._register(dom.addStandardDisposableListener(this._overviewDomElement, dom.EventType.POINTER_DOWN, (e) => {
-			this._modifiedEditor.delegateVerticalScrollbarPointerDown(e);
-		}));
-		this._register(dom.addDisposableListener(this._overviewDomElement, dom.EventType.MOUSE_WHEEL, (e: IMouseWheelEvent) => {
-			this._modifiedEditor.delegateScrollFromMouseWheelEvent(e);
-		}, { passive: false }));
-		if (this._options.renderOverviewRuler) {
-			this._containerDomElement.appendChild(this._overviewDomElement);
-		}
-
-		// Create left side
-		this._originalDomNode = document.createElement('div');
-		this._originalDomNode.className = 'editor original';
-		this._originalDomNode.style.position = 'absolute';
-		this._originalDomNode.style.height = '100%';
-		this._containerDomElement.appendChild(this._originalDomNode);
-
-		// Create right side
-		this._modifiedDomNode = document.createElement('div');
-		this._modifiedDomNode.className = 'editor modified';
-		this._modifiedDomNode.style.position = 'absolute';
-		this._modifiedDomNode.style.height = '100%';
-		this._containerDomElement.appendChild(this._modifiedDomNode);
-
-		this._beginUpdateDecorationsTimeout = -1;
-		this._currentlyChangingViewZones = false;
-		this._diffComputationToken = 0;
-
-		this._originalEditorState = new VisualEditorState(contextMenuService, clipboardService);
-		this._modifiedEditorState = new VisualEditorState(contextMenuService, clipboardService);
-
-		this._isVisible = true;
-		this._isHandlingScrollEvent = false;
-
-		this._elementSizeObserver = this._register(new ElementSizeObserver(this._containerDomElement, options.dimension));
-		this._register(this._elementSizeObserver.onDidChange(() => this._onDidContainerSizeChanged()));
-		if (options.automaticLayout) {
-			this._elementSizeObserver.startObserving();
-		}
-
-		this._diffComputationResult = null;
-
-		this._originalEditor = this._createLeftHandSideEditor(options, codeEditorWidgetOptions.originalEditor || {});
-		this._modifiedEditor = this._createRightHandSideEditor(options, codeEditorWidgetOptions.modifiedEditor || {});
-
-		this._originalOverviewRuler = null;
-		this._modifiedOverviewRuler = null;
-
-		this._reviewPane = instantiationService.createInstance(DiffReview, this);
-		this._containerDomElement.appendChild(this._reviewPane.domNode.domNode);
-		this._containerDomElement.appendChild(this._reviewPane.shadow.domNode);
-		this._containerDomElement.appendChild(this._reviewPane.actionBarContainer.domNode);
-
-		if (this._options.renderSideBySide) {
-			this._setStrategy(new DiffEditorWidgetSideBySide(this._createDataSource(), this._options.enableSplitViewResizing, this._options.splitViewDefaultRatio));
-		} else {
-			this._setStrategy(new DiffEditorWidgetInline(this._createDataSource(), this._options.enableSplitViewResizing));
-		}
-
-		this._register(themeService.onDidColorThemeChange(t => {
-			if (this._strategy && this._strategy.applyColors(t)) {
-				this._updateDecorationsRunner.schedule();
-			}
-			this._containerDomElement.className = DiffEditorWidget._getClassName(this._themeService.getColorTheme(), this._options.renderSideBySide);
-		}));
-
-		const contributions: IDiffEditorContributionDescription[] = EditorExtensionsRegistry.getDiffEditorContributions();
-		for (const desc of contributions) {
-			try {
-				this._register(instantiationService.createInstance(desc.ctor, this));
-			} catch (err) {
-				onUnexpectedError(err);
-			}
-		}
-
-		this._codeEditorService.addDiffEditor(this);
-	}
-
-	public get ignoreTrimWhitespace(): boolean {
-		return this._options.ignoreTrimWhitespace;
-	}
-
-	public get maxComputationTime(): number {
-		return this._options.maxComputationTime;
-	}
-
-	public get renderSideBySide(): boolean {
-		return this._options.renderSideBySide;
-	}
-
-	public getContentHeight(): number {
-		return this._modifiedEditor.getContentHeight();
-	}
-
-	public getViewWidth(): number {
-		return this._elementSizeObserver.getWidth();
-	}
-
-	setBoundarySashes(sashes: IBoundarySashes) {
-		this._boundarySashes = sashes;
-		this._strategy.setBoundarySashes(sashes);
-	}
-
-	private _setState(newState: editorBrowser.DiffEditorState): void {
-		if (this._state === newState) {
-			return;
-		}
-		this._state = newState;
-
-		if (this._updatingDiffProgress) {
-			this._updatingDiffProgress.done();
-			this._updatingDiffProgress = null;
-		}
-
-		if (this._state === editorBrowser.DiffEditorState.ComputingDiff) {
-			this._updatingDiffProgress = this._editorProgressService.show(true, 1000);
-		}
-	}
-
-	public hasWidgetFocus(): boolean {
-		return dom.isAncestor(document.activeElement, this._domElement);
-	}
-
-	public accessibleDiffViewerNext(): void {
-		this._reviewPane.next();
-	}
-
-	public accessibleDiffViewerPrev(): void {
-		this._reviewPane.prev();
-	}
-
-	private static _getClassName(theme: IColorTheme, renderSideBySide: boolean): string {
-		let result = 'monaco-diff-editor monaco-editor-background ';
-		if (renderSideBySide) {
-			result += 'side-by-side ';
-		}
-		result += getThemeTypeSelector(theme.type);
-		return result;
-	}
-
-	private _disposeOverviewRulers(): void {
-		if (this._originalOverviewRuler) {
-			this._overviewDomElement.removeChild(this._originalOverviewRuler.getDomNode());
-			this._originalOverviewRuler.dispose();
-			this._originalOverviewRuler = null;
-		}
-		if (this._modifiedOverviewRuler) {
-			this._overviewDomElement.removeChild(this._modifiedOverviewRuler.getDomNode());
-			this._modifiedOverviewRuler.dispose();
-			this._modifiedOverviewRuler = null;
-		}
-	}
-
-	private _createOverviewRulers(): void {
-		if (!this._options.renderOverviewRuler) {
-			return;
-		}
-
-		assert.ok(!this._originalOverviewRuler && !this._modifiedOverviewRuler);
-
-		if (this._originalEditor.hasModel()) {
-			this._originalOverviewRuler = this._originalEditor.createOverviewRuler('original diffOverviewRuler')!;
-			this._overviewDomElement.appendChild(this._originalOverviewRuler.getDomNode());
-		}
-		if (this._modifiedEditor.hasModel()) {
-			this._modifiedOverviewRuler = this._modifiedEditor.createOverviewRuler('modified diffOverviewRuler')!;
-			this._overviewDomElement.appendChild(this._modifiedOverviewRuler.getDomNode());
-		}
-
-		this._layoutOverviewRulers();
-	}
-
-	private _createLeftHandSideEditor(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>, codeEditorWidgetOptions: ICodeEditorWidgetOptions): CodeEditorWidget {
-		const editor = this._createInnerEditor(this._instantiationService, this._originalDomNode, this._adjustOptionsForLeftHandSide(options), codeEditorWidgetOptions);
-
-		this._register(editor.onDidScrollChange((e) => {
-			if (this._isHandlingScrollEvent) {
-				return;
-			}
-			if (!e.scrollTopChanged && !e.scrollLeftChanged && !e.scrollHeightChanged) {
-				return;
-			}
-			this._isHandlingScrollEvent = true;
-			this._modifiedEditor.setScrollPosition({
-				scrollLeft: e.scrollLeft,
-				scrollTop: e.scrollTop
-			});
-			this._isHandlingScrollEvent = false;
-
-			this._layoutOverviewViewport();
-		}));
-
-		this._register(editor.onDidChangeViewZones(() => {
-			this._onViewZonesChanged();
-		}));
-
-		this._register(editor.onDidChangeConfiguration((e) => {
-			if (!editor.getModel()) {
-				return;
-			}
-			if (e.hasChanged(EditorOption.fontInfo)) {
-				this._updateDecorationsRunner.schedule();
-			}
-			if (e.hasChanged(EditorOption.wrappingInfo)) {
-				this._updateDecorationsRunner.cancel();
-				this._updateDecorations();
-			}
-		}));
-
-		this._register(editor.onDidChangeHiddenAreas(() => {
-			this._updateDecorationsRunner.cancel();
-			this._updateDecorations();
-		}));
-
-		this._register(editor.onDidChangeModelContent(() => {
-			if (this._isVisible) {
-				this._beginUpdateDecorationsSoon();
-			}
-		}));
-
-		const isInDiffLeftEditorKey = this._contextKeyService.createKey<boolean>('isInDiffLeftEditor', editor.hasWidgetFocus());
-		this._register(editor.onDidFocusEditorWidget(() => isInDiffLeftEditorKey.set(true)));
-		this._register(editor.onDidBlurEditorWidget(() => isInDiffLeftEditorKey.set(false)));
-
-		this._register(editor.onDidContentSizeChange(e => {
-			const width = this._originalEditor.getContentWidth() + this._modifiedEditor.getContentWidth() + DiffEditorWidget.ONE_OVERVIEW_WIDTH;
-			const height = Math.max(this._modifiedEditor.getContentHeight(), this._originalEditor.getContentHeight());
-
-			this._onDidContentSizeChange.fire({
-				contentHeight: height,
-				contentWidth: width,
-				contentHeightChanged: e.contentHeightChanged,
-				contentWidthChanged: e.contentWidthChanged
-			});
-		}));
-
-		return editor;
-	}
-
-	private _createRightHandSideEditor(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>, codeEditorWidgetOptions: ICodeEditorWidgetOptions): CodeEditorWidget {
-		const editor = this._createInnerEditor(this._instantiationService, this._modifiedDomNode, this._adjustOptionsForRightHandSide(options), codeEditorWidgetOptions);
-
-		this._register(editor.onDidScrollChange((e) => {
-			if (this._isHandlingScrollEvent) {
-				return;
-			}
-			if (!e.scrollTopChanged && !e.scrollLeftChanged && !e.scrollHeightChanged) {
-				return;
-			}
-			this._isHandlingScrollEvent = true;
-			this._originalEditor.setScrollPosition({
-				scrollLeft: e.scrollLeft,
-				scrollTop: e.scrollTop
-			});
-			this._isHandlingScrollEvent = false;
-
-			this._layoutOverviewViewport();
-		}));
-
-		this._register(editor.onDidChangeViewZones(() => {
-			this._onViewZonesChanged();
-		}));
-
-		this._register(editor.onDidChangeConfiguration((e) => {
-			if (!editor.getModel()) {
-				return;
-			}
-			if (e.hasChanged(EditorOption.fontInfo)) {
-				this._updateDecorationsRunner.schedule();
-			}
-			if (e.hasChanged(EditorOption.wrappingInfo)) {
-				this._updateDecorationsRunner.cancel();
-				this._updateDecorations();
-			}
-		}));
-
-		this._register(editor.onDidChangeHiddenAreas(() => {
-			this._updateDecorationsRunner.cancel();
-			this._updateDecorations();
-		}));
-
-		this._register(editor.onDidChangeModelContent(() => {
-			if (this._isVisible) {
-				this._beginUpdateDecorationsSoon();
-			}
-		}));
-
-		this._register(editor.onDidChangeModelOptions((e) => {
-			if (e.tabSize) {
-				this._updateDecorationsRunner.schedule();
-			}
-		}));
-
-		const isInDiffRightEditorKey = this._contextKeyService.createKey<boolean>('isInDiffRightEditor', editor.hasWidgetFocus());
-		this._register(editor.onDidFocusEditorWidget(() => isInDiffRightEditorKey.set(true)));
-		this._register(editor.onDidBlurEditorWidget(() => isInDiffRightEditorKey.set(false)));
-
-		this._register(editor.onDidContentSizeChange(e => {
-			const width = this._originalEditor.getContentWidth() + this._modifiedEditor.getContentWidth() + DiffEditorWidget.ONE_OVERVIEW_WIDTH;
-			const height = Math.max(this._modifiedEditor.getContentHeight(), this._originalEditor.getContentHeight());
-
-			this._onDidContentSizeChange.fire({
-				contentHeight: height,
-				contentWidth: width,
-				contentHeightChanged: e.contentHeightChanged,
-				contentWidthChanged: e.contentWidthChanged
-			});
-		}));
-
-		// Revert change when an arrow is clicked.
-		this._register(editor.onMouseDown(event => {
-			if (!event.event.rightButton && event.target.position && event.target.element?.className.includes('arrow-revert-change')) {
-				const lineNumber = event.target.position.lineNumber;
-				const viewZone = event.target as editorBrowser.IMouseTargetViewZone | undefined;
-				const change = this._diffComputationResult?.changes.find(c =>
-					// delete change
-					viewZone?.detail.afterLineNumber === c.modifiedStartLineNumber ||
-					// other changes
-					(c.modifiedEndLineNumber > 0 && c.modifiedStartLineNumber === lineNumber));
-				if (change) {
-					this.revertChange(change);
-				}
-				event.event.stopPropagation();
-				this._updateDecorations();
-				return;
-			}
-		}));
-
-		return editor;
-	}
-
-	/**
-	 * Reverts a change in the modified editor.
-	 */
-	revertChange(change: IChange) {
-		const editor = this._modifiedEditor;
-		const original = this._originalEditor.getModel();
-		const modified = this._modifiedEditor.getModel();
-		if (!original || !modified || !editor) {
-			return;
-		}
-
-		const originalRange = change.originalEndLineNumber > 0 ? new Range(change.originalStartLineNumber, 1, change.originalEndLineNumber, original.getLineMaxColumn(change.originalEndLineNumber)) : null;
-		const originalContent = originalRange ? original.getValueInRange(originalRange) : null;
-
-		const newRange = change.modifiedEndLineNumber > 0 ? new Range(change.modifiedStartLineNumber, 1, change.modifiedEndLineNumber, modified.getLineMaxColumn(change.modifiedEndLineNumber)) : null;
-
-		const eol = modified.getEOL();
-
-		if (change.originalEndLineNumber === 0 && newRange) {
-			// Insert change.
-			// To revert: delete the new content and a linebreak (if possible)
-
-			let range = newRange;
-			if (change.modifiedStartLineNumber > 1) {
-				// Try to include a linebreak from before.
-				range = newRange.setStartPosition(change.modifiedStartLineNumber - 1, modified.getLineMaxColumn(change.modifiedStartLineNumber - 1));
-			} else if (change.modifiedEndLineNumber < modified.getLineCount()) {
-				// Try to include the linebreak from after.
-				range = newRange.setEndPosition(change.modifiedEndLineNumber + 1, 1);
-			}
-			editor.executeEdits('diffEditor', [{
-				range,
-				text: '',
-			}]);
-		} else if (change.modifiedEndLineNumber === 0 && originalContent !== null) {
-			// Delete change.
-			// To revert: insert the old content and a linebreak.
-
-			const insertAt = change.modifiedStartLineNumber < modified.getLineCount() ? new Position(change.modifiedStartLineNumber + 1, 1) : new Position(change.modifiedStartLineNumber, modified.getLineMaxColumn(change.modifiedStartLineNumber));
-			editor.executeEdits('diffEditor', [{
-				range: Range.fromPositions(insertAt, insertAt),
-				text: change.modifiedStartLineNumber < modified.getLineCount() ? originalContent + eol : eol + originalContent,
-			}]);
-		} else if (newRange && originalContent !== null) {
-			// Modified change.
-			editor.executeEdits('diffEditor', [{
-				range: newRange,
-				text: originalContent,
-			}]);
-		}
-	}
-
-	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: Readonly<IEditorConstructionOptions>, editorWidgetOptions: ICodeEditorWidgetOptions): CodeEditorWidget {
-		return instantiationService.createInstance(CodeEditorWidget, container, options, editorWidgetOptions);
-	}
-
-	public override dispose(): void {
-		this._codeEditorService.removeDiffEditor(this);
-
-		if (this._beginUpdateDecorationsTimeout !== -1) {
-			window.clearTimeout(this._beginUpdateDecorationsTimeout);
-			this._beginUpdateDecorationsTimeout = -1;
-		}
-
-		this._cleanViewZonesAndDecorations();
-
-		if (this._originalOverviewRuler) {
-			this._overviewDomElement.removeChild(this._originalOverviewRuler.getDomNode());
-			this._originalOverviewRuler.dispose();
-		}
-		if (this._modifiedOverviewRuler) {
-			this._overviewDomElement.removeChild(this._modifiedOverviewRuler.getDomNode());
-			this._modifiedOverviewRuler.dispose();
-		}
-		this._overviewDomElement.removeChild(this._overviewViewportDomElement.domNode);
-		if (this._options.renderOverviewRuler) {
-			this._containerDomElement.removeChild(this._overviewDomElement);
-		}
-
-		this._containerDomElement.removeChild(this._originalDomNode);
-		this._originalEditor.dispose();
-
-		this._containerDomElement.removeChild(this._modifiedDomNode);
-		this._modifiedEditor.dispose();
-
-		this._strategy.dispose();
-
-		this._containerDomElement.removeChild(this._reviewPane.domNode.domNode);
-		this._containerDomElement.removeChild(this._reviewPane.shadow.domNode);
-		this._containerDomElement.removeChild(this._reviewPane.actionBarContainer.domNode);
-		this._reviewPane.dispose();
-
-		this._domElement.removeChild(this._containerDomElement);
-
-		this._onDidDispose.fire();
-
-		super.dispose();
-	}
-
-	//------------ begin IDiffEditor methods
-
-	public getId(): string {
-		return this.getEditorType() + ':' + this._id;
-	}
-
-	public getEditorType(): string {
-		return editorCommon.EditorType.IDiffEditor;
-	}
-
-	public getLineChanges(): ILineChange[] | null {
-		if (!this._diffComputationResult) {
-			return null;
-		}
-		return this._diffComputationResult.changes;
-	}
-
-	public getDiffComputationResult(): IDiffComputationResult | null {
-		return this._diffComputationResult;
-	}
-
-	public getOriginalEditor(): editorBrowser.ICodeEditor {
-		return this._originalEditor;
-	}
-
-	public getModifiedEditor(): editorBrowser.ICodeEditor {
-		return this._modifiedEditor;
-	}
-
-	public updateOptions(_newOptions: Readonly<IDiffEditorOptions>): void {
-		const newOptions = validateDiffEditorOptions(_newOptions, this._options);
-		const changed = changedDiffEditorOptions(this._options, newOptions);
-		this._options = newOptions;
-
-		this.isEmbeddedDiffEditorKey.set(typeof _newOptions.isInEmbeddedEditor !== 'undefined' ? _newOptions.isInEmbeddedEditor : false);
-
-		const beginUpdateDecorations = (changed.ignoreTrimWhitespace || changed.renderIndicators || changed.renderMarginRevertIcon);
-		const beginUpdateDecorationsSoon = (this._isVisible && (changed.maxComputationTime || changed.maxFileSize));
-		this._documentDiffProvider.setOptions(newOptions);
-
-		if (beginUpdateDecorations) {
-			this._beginUpdateDecorations();
-		} else if (beginUpdateDecorationsSoon) {
-			this._beginUpdateDecorationsSoon();
-		}
-
-		this._modifiedEditor.updateOptions(this._adjustOptionsForRightHandSide(_newOptions));
-		this._originalEditor.updateOptions(this._adjustOptionsForLeftHandSide(_newOptions));
-
-		// enableSplitViewResizing
-		this._strategy.setEnableSplitViewResizing(this._options.enableSplitViewResizing, this._options.splitViewDefaultRatio);
-
-		// renderSideBySide
-		if (changed.renderSideBySide) {
-			if (this._options.renderSideBySide) {
-				this._setStrategy(new DiffEditorWidgetSideBySide(this._createDataSource(), this._options.enableSplitViewResizing, this._options.splitViewDefaultRatio));
-			} else {
-				this._setStrategy(new DiffEditorWidgetInline(this._createDataSource(), this._options.enableSplitViewResizing));
-			}
-			// Update class name
-			this._containerDomElement.className = DiffEditorWidget._getClassName(this._themeService.getColorTheme(), this._options.renderSideBySide);
-		}
-
-		// renderOverviewRuler
-		if (changed.renderOverviewRuler) {
-			if (this._options.renderOverviewRuler) {
-				this._containerDomElement.appendChild(this._overviewDomElement);
-			} else {
-				this._containerDomElement.removeChild(this._overviewDomElement);
-			}
-		}
-	}
-
-	public getModel(): editorCommon.IDiffEditorModel {
-		return {
-			original: this._originalEditor.getModel()!,
-			modified: this._modifiedEditor.getModel()!
-		};
-	}
-
-	public createViewModel(model: editorCommon.IDiffEditorModel): editorCommon.IDiffEditorViewModel {
-		return {
-			model,
-			async waitForDiff() {
-				// noop
-			},
-		};
-	}
-
-	public setModel(model: editorCommon.IDiffEditorModel | editorCommon.IDiffEditorViewModel | null): void {
-		if (model && 'model' in model) {
-			model = model.model;
-		}
-
-		// Guard us against partial null model
-		if (model && (!model.original || !model.modified)) {
-			throw new Error(!model.original ? 'DiffEditorWidget.setModel: Original model is null' : 'DiffEditorWidget.setModel: Modified model is null');
-		}
-
-		// Remove all view zones & decorations
-		this._cleanViewZonesAndDecorations();
-
-		this._disposeOverviewRulers();
-
-		// Update code editor models
-		this._originalEditor.setModel(model ? model.original : null);
-		this._modifiedEditor.setModel(model ? model.modified : null);
-		this._updateDecorationsRunner.cancel();
-
-		// this.originalEditor.onDidChangeModelOptions
-
-		if (model) {
-			this._originalEditor.setScrollTop(0);
-			this._modifiedEditor.setScrollTop(0);
-		}
-
-		// Disable any diff computations that will come in
-		this._diffComputationResult = null;
-		this._diffComputationToken++;
-		this._setState(editorBrowser.DiffEditorState.Idle);
-
-		if (model) {
-			this._createOverviewRulers();
-
-			// Begin comparing
-			this._beginUpdateDecorations();
-		}
-
-		this._layoutOverviewViewport();
-
-		this._onDidChangeModel.fire();
-
-		// Diff navigator
-		this._diffNavigator = this._register(this._instantiationService.createInstance(DiffNavigator, this, {
-			alwaysRevealFirst: false,
-			findResultLoop: this.getModifiedEditor().getOption(EditorOption.find).loop
-		}));
-	}
-
-	public getContainerDomNode(): HTMLElement {
-		return this._domElement;
-	}
-
-	// #region editorBrowser.IDiffEditor: Delegating to modified Editor
-
-	public getVisibleColumnFromPosition(position: IPosition): number {
-		return this._modifiedEditor.getVisibleColumnFromPosition(position);
-	}
-
-	public getStatusbarColumn(position: IPosition): number {
-		return this._modifiedEditor.getStatusbarColumn(position);
-	}
-
-	public getPosition(): Position | null {
-		return this._modifiedEditor.getPosition();
-	}
-
-	public setPosition(position: IPosition, source: string = 'api'): void {
-		this._modifiedEditor.setPosition(position, source);
-	}
-
-	public revealLine(lineNumber: number, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealLine(lineNumber, scrollType);
-	}
-
-	public revealLineInCenter(lineNumber: number, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealLineInCenter(lineNumber, scrollType);
-	}
-
-	public revealLineInCenterIfOutsideViewport(lineNumber: number, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealLineInCenterIfOutsideViewport(lineNumber, scrollType);
-	}
-
-	public revealLineNearTop(lineNumber: number, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealLineNearTop(lineNumber, scrollType);
-	}
-
-	public revealPosition(position: IPosition, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealPosition(position, scrollType);
-	}
-
-	public revealPositionInCenter(position: IPosition, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealPositionInCenter(position, scrollType);
-	}
-
-	public revealPositionInCenterIfOutsideViewport(position: IPosition, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealPositionInCenterIfOutsideViewport(position, scrollType);
-	}
-
-	public revealPositionNearTop(position: IPosition, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealPositionNearTop(position, scrollType);
-	}
-
-	public getSelection(): Selection | null {
-		return this._modifiedEditor.getSelection();
-	}
-
-	public getSelections(): Selection[] | null {
-		return this._modifiedEditor.getSelections();
-	}
-
-	public setSelection(range: IRange, source?: string): void;
-	public setSelection(editorRange: Range, source?: string): void;
-	public setSelection(selection: ISelection, source?: string): void;
-	public setSelection(editorSelection: Selection, source?: string): void;
-	public setSelection(something: any, source: string = 'api'): void {
-		this._modifiedEditor.setSelection(something, source);
-	}
-
-	public setSelections(ranges: readonly ISelection[], source: string = 'api'): void {
-		this._modifiedEditor.setSelections(ranges, source);
-	}
-
-	public revealLines(startLineNumber: number, endLineNumber: number, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealLines(startLineNumber, endLineNumber, scrollType);
-	}
-
-	public revealLinesInCenter(startLineNumber: number, endLineNumber: number, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealLinesInCenter(startLineNumber, endLineNumber, scrollType);
-	}
-
-	public revealLinesInCenterIfOutsideViewport(startLineNumber: number, endLineNumber: number, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealLinesInCenterIfOutsideViewport(startLineNumber, endLineNumber, scrollType);
-	}
-
-	public revealLinesNearTop(startLineNumber: number, endLineNumber: number, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealLinesNearTop(startLineNumber, endLineNumber, scrollType);
-	}
-
-	public revealRange(range: IRange, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth, revealVerticalInCenter: boolean = false, revealHorizontal: boolean = true): void {
-		this._modifiedEditor.revealRange(range, scrollType, revealVerticalInCenter, revealHorizontal);
-	}
-
-	public revealRangeInCenter(range: IRange, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealRangeInCenter(range, scrollType);
-	}
-
-	public revealRangeInCenterIfOutsideViewport(range: IRange, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealRangeInCenterIfOutsideViewport(range, scrollType);
-	}
-
-	public revealRangeNearTop(range: IRange, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealRangeNearTop(range, scrollType);
-	}
-
-	public revealRangeNearTopIfOutsideViewport(range: IRange, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealRangeNearTopIfOutsideViewport(range, scrollType);
-	}
-
-	public revealRangeAtTop(range: IRange, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
-		this._modifiedEditor.revealRangeAtTop(range, scrollType);
-	}
-
-	public getSupportedActions(): editorCommon.IEditorAction[] {
-		return this._modifiedEditor.getSupportedActions();
-	}
-
-	public focus(): void {
-		this._modifiedEditor.focus();
-	}
-
-	public trigger(source: string | null | undefined, handlerId: string, payload: any): void {
-		this._modifiedEditor.trigger(source, handlerId, payload);
-	}
-
-	public createDecorationsCollection(decorations?: IModelDeltaDecoration[]): editorCommon.IEditorDecorationsCollection {
-		return this._modifiedEditor.createDecorationsCollection(decorations);
-	}
-
-	public changeDecorations(callback: (changeAccessor: IModelDecorationsChangeAccessor) => any): any {
-		return this._modifiedEditor.changeDecorations(callback);
-	}
-
-	// #endregion
-
-	public saveViewState(): editorCommon.IDiffEditorViewState {
-		const originalViewState = this._originalEditor.saveViewState();
-		const modifiedViewState = this._modifiedEditor.saveViewState();
-		return {
-			original: originalViewState,
-			modified: modifiedViewState,
-		};
-	}
-
-	public restoreViewState(s: editorCommon.IDiffEditorViewState): void {
-		if (s && s.original && s.modified) {
-			const diffEditorState = <editorCommon.IDiffEditorViewState>s;
-			this._originalEditor.restoreViewState(diffEditorState.original);
-			this._modifiedEditor.restoreViewState(diffEditorState.modified);
-		}
-	}
-
-	public layout(dimension?: IDimension): void {
-		this._elementSizeObserver.observe(dimension);
-	}
-
-
-	public hasTextFocus(): boolean {
-		return this._originalEditor.hasTextFocus() || this._modifiedEditor.hasTextFocus();
-	}
-
-	public onVisible(): void {
-		this._isVisible = true;
-		this._originalEditor.onVisible();
-		this._modifiedEditor.onVisible();
-		// Begin comparing
-		this._beginUpdateDecorations();
-	}
-
-	public onHide(): void {
-		this._isVisible = false;
-		this._originalEditor.onHide();
-		this._modifiedEditor.onHide();
-		// Remove all view zones & decorations
-		this._cleanViewZonesAndDecorations();
-	}
-
-	//------------ end IDiffEditor methods
-
-
-
-	//------------ begin layouting methods
-
-	private _onDidContainerSizeChanged(): void {
-		this._doLayout();
-	}
-
-	private _getReviewHeight(): number {
-		return this._reviewPane.isVisible() ? this._elementSizeObserver.getHeight() : 0;
-	}
-
-	private _layoutOverviewRulers(): void {
-		if (!this._options.renderOverviewRuler) {
-			return;
-		}
-
-		if (!this._originalOverviewRuler || !this._modifiedOverviewRuler) {
-			return;
-		}
-		const height = this._elementSizeObserver.getHeight();
-		const reviewHeight = this._getReviewHeight();
-
-		const freeSpace = DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH - 2 * DiffEditorWidget.ONE_OVERVIEW_WIDTH;
-		const layoutInfo = this._modifiedEditor.getLayoutInfo();
-		if (layoutInfo) {
-			this._originalOverviewRuler.setLayout({
-				top: 0,
-				width: DiffEditorWidget.ONE_OVERVIEW_WIDTH,
-				right: freeSpace + DiffEditorWidget.ONE_OVERVIEW_WIDTH,
-				height: (height - reviewHeight)
-			});
-			this._modifiedOverviewRuler.setLayout({
-				top: 0,
-				right: 0,
-				width: DiffEditorWidget.ONE_OVERVIEW_WIDTH,
-				height: (height - reviewHeight)
-			});
-		}
-	}
-
-	//------------ end layouting methods
-
-	private _onViewZonesChanged(): void {
-		if (this._currentlyChangingViewZones) {
-			return;
-		}
-		this._updateDecorationsRunner.schedule();
-	}
-
-	private _beginUpdateDecorationsSoon(): void {
-		// Clear previous timeout if necessary
-		if (this._beginUpdateDecorationsTimeout !== -1) {
-			window.clearTimeout(this._beginUpdateDecorationsTimeout);
-			this._beginUpdateDecorationsTimeout = -1;
-		}
-		this._beginUpdateDecorationsTimeout = window.setTimeout(() => this._beginUpdateDecorations(), DiffEditorWidget.UPDATE_DIFF_DECORATIONS_DELAY);
-	}
-
-	private _lastOriginalWarning: URI | null = null;
-	private _lastModifiedWarning: URI | null = null;
-
-	private static _equals(a: URI | null, b: URI | null): boolean {
-		if (!a && !b) {
-			return true;
-		}
-		if (!a || !b) {
-			return false;
-		}
-		return (a.toString() === b.toString());
-	}
-
-	private _beginUpdateDecorations(): void {
-		if (this._beginUpdateDecorationsTimeout !== -1) {
-			// Cancel any pending requests in case this method is called directly
-			window.clearTimeout(this._beginUpdateDecorationsTimeout);
-			this._beginUpdateDecorationsTimeout = -1;
-		}
-		const currentOriginalModel = this._originalEditor.getModel();
-		const currentModifiedModel = this._modifiedEditor.getModel();
-		if (!currentOriginalModel || !currentModifiedModel) {
-			return;
-		}
-
-		// Prevent old diff requests to come if a new request has been initiated
-		// The best method would be to call cancel on the Promise, but this is not
-		// yet supported, so using tokens for now.
-		this._diffComputationToken++;
-		const currentToken = this._diffComputationToken;
-
-		const diffLimit = this._options.maxFileSize * 1024 * 1024; // MB
-		const canSyncModelForDiff = (model: ITextModel): boolean => {
-			const bufferTextLength = model.getValueLength();
-			return (diffLimit === 0 || bufferTextLength <= diffLimit);
-		};
-
-		if (!canSyncModelForDiff(currentOriginalModel) || !canSyncModelForDiff(currentModifiedModel)) {
-			if (
-				!DiffEditorWidget._equals(currentOriginalModel.uri, this._lastOriginalWarning)
-				|| !DiffEditorWidget._equals(currentModifiedModel.uri, this._lastModifiedWarning)
-			) {
-				this._lastOriginalWarning = currentOriginalModel.uri;
-				this._lastModifiedWarning = currentModifiedModel.uri;
-				this._notificationService.warn(nls.localize("diff.tooLarge", "Cannot compare files because one file is too large."));
-			}
-			return;
-		}
-
-		this._setState(editorBrowser.DiffEditorState.ComputingDiff);
-		this._documentDiffProvider.computeDiff(currentOriginalModel, currentModifiedModel, {
-			ignoreTrimWhitespace: this._options.ignoreTrimWhitespace,
-			maxComputationTimeMs: this._options.maxComputationTime,
-			computeMoves: false,
-		}, CancellationToken.None).then(result => {
-			if (currentToken === this._diffComputationToken
-				&& currentOriginalModel === this._originalEditor.getModel()
-				&& currentModifiedModel === this._modifiedEditor.getModel()
-			) {
-				this._setState(editorBrowser.DiffEditorState.DiffComputed);
-				this._diffComputationResult = {
-					identical: result.identical,
-					quitEarly: result.quitEarly,
-					changes2: result.changes,
-					changes: result.changes.map(m => {
-						// TODO don't do this translation, but use the diff result directly
-						let originalStartLineNumber: number;
-						let originalEndLineNumber: number;
-						let modifiedStartLineNumber: number;
-						let modifiedEndLineNumber: number;
-						let innerChanges = m.innerChanges;
-
-						if (m.original.isEmpty) {
-							// Insertion
-							originalStartLineNumber = m.original.startLineNumber - 1;
-							originalEndLineNumber = 0;
-							innerChanges = undefined;
-						} else {
-							originalStartLineNumber = m.original.startLineNumber;
-							originalEndLineNumber = m.original.endLineNumberExclusive - 1;
-						}
-
-						if (m.modified.isEmpty) {
-							// Deletion
-							modifiedStartLineNumber = m.modified.startLineNumber - 1;
-							modifiedEndLineNumber = 0;
-							innerChanges = undefined;
-						} else {
-							modifiedStartLineNumber = m.modified.startLineNumber;
-							modifiedEndLineNumber = m.modified.endLineNumberExclusive - 1;
-						}
-
-						return {
-							originalStartLineNumber,
-							originalEndLineNumber,
-							modifiedStartLineNumber,
-							modifiedEndLineNumber,
-							charChanges: innerChanges?.map(m => ({
-								originalStartLineNumber: m.originalRange.startLineNumber,
-								originalStartColumn: m.originalRange.startColumn,
-								originalEndLineNumber: m.originalRange.endLineNumber,
-								originalEndColumn: m.originalRange.endColumn,
-								modifiedStartLineNumber: m.modifiedRange.startLineNumber,
-								modifiedStartColumn: m.modifiedRange.startColumn,
-								modifiedEndLineNumber: m.modifiedRange.endLineNumber,
-								modifiedEndColumn: m.modifiedRange.endColumn,
-							}))
-						};
-					})
-				};
-				this._updateDecorationsRunner.schedule();
-				this._onDidUpdateDiff.fire();
-			}
-		}, (error) => {
-			if (currentToken === this._diffComputationToken
-				&& currentOriginalModel === this._originalEditor.getModel()
-				&& currentModifiedModel === this._modifiedEditor.getModel()
-			) {
-				this._setState(editorBrowser.DiffEditorState.DiffComputed);
-				this._diffComputationResult = null;
-				this._updateDecorationsRunner.schedule();
-			}
-		});
-	}
-
-	private _cleanViewZonesAndDecorations(): void {
-		this._originalEditorState.clean(this._originalEditor);
-		this._modifiedEditorState.clean(this._modifiedEditor);
-	}
-
-	private _updateDecorations(): void {
-		if (!this._originalEditor.getModel() || !this._modifiedEditor.getModel()) {
-			return;
-		}
-
-		const lineChanges = (this._diffComputationResult ? this._diffComputationResult.changes : []);
-
-		const foreignOriginal = this._originalEditorState.getForeignViewZones(this._originalEditor.getWhitespaces());
-		const foreignModified = this._modifiedEditorState.getForeignViewZones(this._modifiedEditor.getWhitespaces());
-
-		const renderMarginRevertIcon = this._options.renderMarginRevertIcon && !this._modifiedEditor.getOption(EditorOption.readOnly);
-		const diffDecorations = this._strategy.getEditorsDiffDecorations(lineChanges, this._options.ignoreTrimWhitespace, this._options.renderIndicators, renderMarginRevertIcon, foreignOriginal, foreignModified);
-
-		try {
-			this._currentlyChangingViewZones = true;
-			this._originalEditorState.apply(this._originalEditor, this._originalOverviewRuler, diffDecorations.original, false);
-			this._modifiedEditorState.apply(this._modifiedEditor, this._modifiedOverviewRuler, diffDecorations.modified, true);
-		} finally {
-			this._currentlyChangingViewZones = false;
-		}
-	}
-
-	private _adjustOptionsForSubEditor(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>): IEditorConstructionOptions {
-		const clonedOptions = { ...options };
-		clonedOptions.inDiffEditor = true;
-		clonedOptions.automaticLayout = false;
-		// Clone scrollbar options before changing them
-		clonedOptions.scrollbar = { ...(clonedOptions.scrollbar || {}) };
-		clonedOptions.scrollbar.vertical = 'visible';
-		clonedOptions.folding = false;
-		clonedOptions.codeLens = this._options.diffCodeLens;
-		clonedOptions.fixedOverflowWidgets = true;
-		// clonedOptions.lineDecorationsWidth = '2ch';
-		// Clone minimap options before changing them
-		clonedOptions.minimap = { ...(clonedOptions.minimap || {}) };
-		clonedOptions.minimap.enabled = false;
-		return clonedOptions;
-	}
-
-	private _adjustOptionsForLeftHandSide(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>): IEditorConstructionOptions {
-		const result = this._adjustOptionsForSubEditor(options);
-		if (!this._options.renderSideBySide) {
-			// never wrap hidden editor
-			result.wordWrapOverride1 = 'off';
-			result.wordWrapOverride2 = 'off';
-			result.stickyScroll = { enabled: false };
-		} else {
-			result.wordWrapOverride1 = this._options.diffWordWrap;
-		}
-		if (options.originalAriaLabel) {
-			result.ariaLabel = options.originalAriaLabel;
-		}
-		this._updateAriaLabel(result);
-		result.readOnly = !this._options.originalEditable;
-		result.dropIntoEditor = { enabled: !result.readOnly };
-		result.extraEditorClassName = 'original-in-monaco-diff-editor';
-		return {
-			...result,
-			dimension: {
-				height: 0,
-				width: 0
-			}
-		};
-	}
-
-	private _updateAriaLabel(options: IEditorConstructionOptions): void {
-		let ariaLabel = options.ariaLabel ?? '';
-		if (this._options.accessibilityVerbose) {
-			ariaLabel += ariaNavigationTip;
-		} else if (ariaLabel) {
-			ariaLabel = ariaLabel.replaceAll(ariaNavigationTip, '');
-		}
-		options.ariaLabel = ariaLabel;
-	}
-
-	private _adjustOptionsForRightHandSide(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>): IEditorConstructionOptions {
-		const result = this._adjustOptionsForSubEditor(options);
-		if (options.modifiedAriaLabel) {
-			result.ariaLabel = options.modifiedAriaLabel;
-		}
-		this._updateAriaLabel(result);
-		result.wordWrapOverride1 = this._options.diffWordWrap;
-		result.revealHorizontalRightPadding = EditorOptions.revealHorizontalRightPadding.defaultValue + DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH;
-		result.scrollbar!.verticalHasArrows = false;
-		result.extraEditorClassName = 'modified-in-monaco-diff-editor';
-		return {
-			...result,
-			dimension: {
-				height: 0,
-				width: 0
-			}
-		};
-	}
-
-	public doLayout(): void {
-		this._elementSizeObserver.observe();
-		this._doLayout();
-	}
-
-	private _doLayout(): void {
-		const width = this._elementSizeObserver.getWidth();
-		const height = this._elementSizeObserver.getHeight();
-		const reviewHeight = this._getReviewHeight();
-
-		const splitPoint = this._strategy.layout();
-
-		this._originalDomNode.style.width = splitPoint + 'px';
-		this._originalDomNode.style.left = '0px';
-
-		this._modifiedDomNode.style.width = (width - splitPoint - DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH) + 'px';
-		this._modifiedDomNode.style.left = splitPoint + 'px';
-
-		this._overviewDomElement.style.top = '0px';
-		this._overviewDomElement.style.height = (height - reviewHeight) + 'px';
-		this._overviewDomElement.style.width = DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH + 'px';
-		this._overviewDomElement.style.left = (width - DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH) + 'px';
-		this._overviewViewportDomElement.setWidth(DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH);
-		this._overviewViewportDomElement.setHeight(30);
-
-		this._originalEditor.layout({ width: splitPoint, height: (height - reviewHeight) });
-		this._modifiedEditor.layout({ width: width - splitPoint - (this._options.renderOverviewRuler ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0), height: (height - reviewHeight) });
-
-		if (this._originalOverviewRuler || this._modifiedOverviewRuler) {
-			this._layoutOverviewRulers();
-		}
-
-		this._reviewPane.layout(height - reviewHeight, width, reviewHeight);
-
-		this._layoutOverviewViewport();
-	}
-
-	private _layoutOverviewViewport(): void {
-		const layout = this._computeOverviewViewport();
-		if (!layout) {
-			this._overviewViewportDomElement.setTop(0);
-			this._overviewViewportDomElement.setHeight(0);
-		} else {
-			this._overviewViewportDomElement.setTop(layout.top);
-			this._overviewViewportDomElement.setHeight(layout.height);
-		}
-	}
-
-	private _computeOverviewViewport(): { height: number; top: number } | null {
-		const layoutInfo = this._modifiedEditor.getLayoutInfo();
-		if (!layoutInfo) {
-			return null;
-		}
-
-		const scrollTop = this._modifiedEditor.getScrollTop();
-		const scrollHeight = this._modifiedEditor.getScrollHeight();
-
-		const computedAvailableSize = Math.max(0, layoutInfo.height);
-		const computedRepresentableSize = Math.max(0, computedAvailableSize - 2 * 0);
-		const computedRatio = scrollHeight > 0 ? (computedRepresentableSize / scrollHeight) : 0;
-
-		const computedSliderSize = Math.max(0, Math.floor(layoutInfo.height * computedRatio));
-		const computedSliderPosition = Math.floor(scrollTop * computedRatio);
-
-		return {
-			height: computedSliderSize,
-			top: computedSliderPosition
-		};
-	}
-
-	private _createDataSource(): IDataSource {
-		return {
-			getWidth: () => {
-				return this._elementSizeObserver.getWidth();
-			},
-
-			getHeight: () => {
-				return (this._elementSizeObserver.getHeight() - this._getReviewHeight());
-			},
-
-			getOptions: () => {
-				return {
-					renderOverviewRuler: this._options.renderOverviewRuler
-				};
-			},
-
-			getContainerDomNode: () => {
-				return this._containerDomElement;
-			},
-
-			relayoutEditors: () => {
-				this._doLayout();
-			},
-
-			getOriginalEditor: () => {
-				return this._originalEditor;
-			},
-
-			getModifiedEditor: () => {
-				return this._modifiedEditor;
-			}
-		};
-	}
-
-	private _setStrategy(newStrategy: DiffEditorWidgetStyle): void {
-		this._strategy?.dispose();
-
-		this._strategy = newStrategy;
-
-		if (this._boundarySashes) {
-			newStrategy.setBoundarySashes(this._boundarySashes);
-		}
-
-		newStrategy.applyColors(this._themeService.getColorTheme());
-
-		if (this._diffComputationResult) {
-			this._updateDecorations();
-		}
-
-		// Just do a layout, the strategy might need it
-		this._doLayout();
-	}
-
-	public goToDiff(target: 'previous' | 'next'): void {
-		if (target === 'next') {
-			this._diffNavigator?.next();
-		} else {
-			this._diffNavigator?.previous();
-		}
-	}
-
-	public revealFirstDiff(): void {
-		// This is a hack, but it works.
-		if (this._diffNavigator) {
-			this._diffNavigator.revealFirst = true;
-		}
-	}
-}
-
-interface IDataSource {
-	getWidth(): number;
-	getHeight(): number;
-	getOptions(): { renderOverviewRuler: boolean };
-	getContainerDomNode(): HTMLElement;
-	relayoutEditors(): void;
-
-	getOriginalEditor(): CodeEditorWidget;
-	getModifiedEditor(): CodeEditorWidget;
-}
-
-abstract class DiffEditorWidgetStyle extends Disposable {
-
-	protected _dataSource: IDataSource;
-	protected _insertColor: Color | null;
-	protected _removeColor: Color | null;
-
-	constructor(dataSource: IDataSource) {
-		super();
-		this._dataSource = dataSource;
-		this._insertColor = null;
-		this._removeColor = null;
-	}
-
-	public applyColors(theme: IColorTheme): boolean {
-		const newInsertColor = theme.getColor(diffOverviewRulerInserted) || (theme.getColor(diffInserted) || defaultInsertColor).transparent(2);
-		const newRemoveColor = theme.getColor(diffOverviewRulerRemoved) || (theme.getColor(diffRemoved) || defaultRemoveColor).transparent(2);
-		const hasChanges = !newInsertColor.equals(this._insertColor) || !newRemoveColor.equals(this._removeColor);
-		this._insertColor = newInsertColor;
-		this._removeColor = newRemoveColor;
-		return hasChanges;
-	}
-
-	public getEditorsDiffDecorations(lineChanges: ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, renderMarginRevertIcon: boolean, originalWhitespaces: IEditorWhitespace[], modifiedWhitespaces: IEditorWhitespace[]): IEditorsDiffDecorationsWithZones {
-		// Get view zones
-		modifiedWhitespaces = modifiedWhitespaces.sort((a, b) => {
-			return a.afterLineNumber - b.afterLineNumber;
-		});
-		originalWhitespaces = originalWhitespaces.sort((a, b) => {
-			return a.afterLineNumber - b.afterLineNumber;
-		});
-		const zones = this._getViewZones(lineChanges, originalWhitespaces, modifiedWhitespaces, renderIndicators);
-
-		// Get decorations & overview ruler zones
-		const originalDecorations = this._getOriginalEditorDecorations(zones, lineChanges, ignoreTrimWhitespace, renderIndicators);
-		const modifiedDecorations = this._getModifiedEditorDecorations(zones, lineChanges, ignoreTrimWhitespace, renderIndicators, renderMarginRevertIcon);
-
-		return {
-			original: {
-				decorations: originalDecorations.decorations,
-				overviewZones: originalDecorations.overviewZones,
-				zones: zones.original
-			},
-			modified: {
-				decorations: modifiedDecorations.decorations,
-				overviewZones: modifiedDecorations.overviewZones,
-				zones: zones.modified
-			}
-		};
-	}
-
-	protected abstract _getViewZones(lineChanges: ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[], renderIndicators: boolean): IEditorsZones;
-	protected abstract _getOriginalEditorDecorations(zones: IEditorsZones, lineChanges: ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean): IEditorDiffDecorations;
-	protected abstract _getModifiedEditorDecorations(zones: IEditorsZones, lineChanges: ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, renderMarginRevertIcon: boolean): IEditorDiffDecorations;
-
-	public abstract setEnableSplitViewResizing(enableSplitViewResizing: boolean, defaultRatio: number): void;
-	public abstract layout(): number;
-
-	setBoundarySashes(_sashes: IBoundarySashes): void {
-		// To be implemented by subclasses
-	}
-}
-
-interface IMyViewZone {
-	shouldNotShrink?: boolean;
-	afterLineNumber: number;
-	afterColumn?: number;
-	heightInLines: number;
-	minWidthInPx?: number;
-	domNode: HTMLElement | null;
-	marginDomNode?: HTMLElement | null;
-	diff?: IDiffLinesChange;
-}
-
-class ForeignViewZonesIterator {
-
-	private _index: number;
-	private readonly _source: IEditorWhitespace[];
-	public current: IEditorWhitespace | null;
-
-	constructor(source: IEditorWhitespace[]) {
-		this._source = source;
-		this._index = -1;
-		this.current = null;
-		this.advance();
-	}
-
-	public advance(): void {
-		this._index++;
-		if (this._index < this._source.length) {
-			this.current = this._source[this._index];
-		} else {
-			this.current = null;
-		}
-	}
-}
-
-abstract class ViewZonesComputer {
-
-	constructor(
-		private readonly _lineChanges: ILineChange[],
-		private readonly _originalForeignVZ: IEditorWhitespace[],
-		private readonly _modifiedForeignVZ: IEditorWhitespace[],
-		protected readonly _originalEditor: CodeEditorWidget,
-		protected readonly _modifiedEditor: CodeEditorWidget
-	) {
-	}
-
-	private static _getViewLineCount(editor: CodeEditorWidget, startLineNumber: number, endLineNumber: number): number {
-		const model = editor.getModel();
-		const viewModel = editor._getViewModel();
-		if (model && viewModel) {
-			const viewRange = getViewRange(model, viewModel, startLineNumber, endLineNumber);
-			return (viewRange.endLineNumber - viewRange.startLineNumber + 1);
-		}
-
-		return (endLineNumber - startLineNumber + 1);
-	}
-
-	public getViewZones(): IEditorsZones {
-		const originalLineHeight = this._originalEditor.getOption(EditorOption.lineHeight);
-		const modifiedLineHeight = this._modifiedEditor.getOption(EditorOption.lineHeight);
-		const originalHasWrapping = (this._originalEditor.getOption(EditorOption.wrappingInfo).wrappingColumn !== -1);
-		const modifiedHasWrapping = (this._modifiedEditor.getOption(EditorOption.wrappingInfo).wrappingColumn !== -1);
-		const hasWrapping = (originalHasWrapping || modifiedHasWrapping);
-		const originalModel = this._originalEditor.getModel()!;
-		const originalCoordinatesConverter = this._originalEditor._getViewModel()!.coordinatesConverter;
-		const modifiedCoordinatesConverter = this._modifiedEditor._getViewModel()!.coordinatesConverter;
-
-		const result: { original: IMyViewZone[]; modified: IMyViewZone[] } = {
-			original: [],
-			modified: []
-		};
-
-		let lineChangeModifiedLength: number = 0;
-		let lineChangeOriginalLength: number = 0;
-		let originalEquivalentLineNumber: number = 0;
-		let modifiedEquivalentLineNumber: number = 0;
-		let originalEndEquivalentLineNumber: number = 0;
-		let modifiedEndEquivalentLineNumber: number = 0;
-
-		const sortMyViewZones = (a: IMyViewZone, b: IMyViewZone) => {
-			return a.afterLineNumber - b.afterLineNumber;
-		};
-
-		const addAndCombineIfPossible = (destination: IMyViewZone[], item: IMyViewZone) => {
-			if (item.domNode === null && destination.length > 0) {
-				const lastItem = destination[destination.length - 1];
-				if (lastItem.afterLineNumber === item.afterLineNumber && lastItem.domNode === null) {
-					lastItem.heightInLines += item.heightInLines;
-					return;
-				}
-			}
-			destination.push(item);
-		};
-
-		const modifiedForeignVZ = new ForeignViewZonesIterator(this._modifiedForeignVZ);
-		const originalForeignVZ = new ForeignViewZonesIterator(this._originalForeignVZ);
-
-		let lastOriginalLineNumber = 1;
-		let lastModifiedLineNumber = 1;
-
-		// In order to include foreign view zones after the last line change, the for loop will iterate once more after the end of the `lineChanges` array
-		for (let i = 0, length = this._lineChanges.length; i <= length; i++) {
-			const lineChange = (i < length ? this._lineChanges[i] : null);
-
-			if (lineChange !== null) {
-				originalEquivalentLineNumber = lineChange.originalStartLineNumber + (lineChange.originalEndLineNumber > 0 ? -1 : 0);
-				modifiedEquivalentLineNumber = lineChange.modifiedStartLineNumber + (lineChange.modifiedEndLineNumber > 0 ? -1 : 0);
-				lineChangeOriginalLength = (lineChange.originalEndLineNumber > 0 ? ViewZonesComputer._getViewLineCount(this._originalEditor, lineChange.originalStartLineNumber, lineChange.originalEndLineNumber) : 0);
-				lineChangeModifiedLength = (lineChange.modifiedEndLineNumber > 0 ? ViewZonesComputer._getViewLineCount(this._modifiedEditor, lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber) : 0);
-				originalEndEquivalentLineNumber = Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber);
-				modifiedEndEquivalentLineNumber = Math.max(lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber);
-			} else {
-				// Increase to very large value to get the producing tests of foreign view zones running
-				originalEquivalentLineNumber += 10000000 + lineChangeOriginalLength;
-				modifiedEquivalentLineNumber += 10000000 + lineChangeModifiedLength;
-				originalEndEquivalentLineNumber = originalEquivalentLineNumber;
-				modifiedEndEquivalentLineNumber = modifiedEquivalentLineNumber;
-			}
-
-			// Each step produces view zones, and after producing them, we try to cancel them out, to avoid empty-empty view zone cases
-			let stepOriginal: IMyViewZone[] = [];
-			let stepModified: IMyViewZone[] = [];
-
-			// ---------------------------- PRODUCE VIEW ZONES
-
-			// [PRODUCE] View zones due to line mapping differences (equal lines but wrapped differently)
-			if (hasWrapping) {
-				let count: number;
-				if (lineChange) {
-					if (lineChange.originalEndLineNumber > 0) {
-						count = lineChange.originalStartLineNumber - lastOriginalLineNumber;
-					} else {
-						count = lineChange.modifiedStartLineNumber - lastModifiedLineNumber;
-					}
-				} else {
-					// `lastOriginalLineNumber` has not been looked at yet
-					count = originalModel.getLineCount() - lastOriginalLineNumber + 1;
-				}
-
-				for (let i = 0; i < count; i++) {
-					const originalLineNumber = lastOriginalLineNumber + i;
-					const modifiedLineNumber = lastModifiedLineNumber + i;
-
-					const originalViewLineCount = originalCoordinatesConverter.getModelLineViewLineCount(originalLineNumber);
-					const modifiedViewLineCount = modifiedCoordinatesConverter.getModelLineViewLineCount(modifiedLineNumber);
-
-					if (originalViewLineCount < modifiedViewLineCount) {
-						stepOriginal.push({
-							afterLineNumber: originalLineNumber,
-							heightInLines: modifiedViewLineCount - originalViewLineCount,
-							domNode: null,
-							marginDomNode: null
-						});
-					} else if (originalViewLineCount > modifiedViewLineCount) {
-						stepModified.push({
-							afterLineNumber: modifiedLineNumber,
-							heightInLines: originalViewLineCount - modifiedViewLineCount,
-							domNode: null,
-							marginDomNode: null
-						});
-					}
-				}
-				if (lineChange) {
-					lastOriginalLineNumber = (lineChange.originalEndLineNumber > 0 ? lineChange.originalEndLineNumber : lineChange.originalStartLineNumber) + 1;
-					lastModifiedLineNumber = (lineChange.modifiedEndLineNumber > 0 ? lineChange.modifiedEndLineNumber : lineChange.modifiedStartLineNumber) + 1;
-				}
-			}
-
-			// [PRODUCE] View zone(s) in original-side due to foreign view zone(s) in modified-side
-			while (modifiedForeignVZ.current && modifiedForeignVZ.current.afterLineNumber <= modifiedEndEquivalentLineNumber) {
-				let viewZoneLineNumber: number;
-				if (modifiedForeignVZ.current.afterLineNumber <= modifiedEquivalentLineNumber) {
-					viewZoneLineNumber = originalEquivalentLineNumber - modifiedEquivalentLineNumber + modifiedForeignVZ.current.afterLineNumber;
-				} else {
-					viewZoneLineNumber = originalEndEquivalentLineNumber;
-				}
-
-				let marginDomNode: HTMLDivElement | null = null;
-				if (lineChange && lineChange.modifiedStartLineNumber <= modifiedForeignVZ.current.afterLineNumber && modifiedForeignVZ.current.afterLineNumber <= lineChange.modifiedEndLineNumber) {
-					marginDomNode = this._createOriginalMarginDomNodeForModifiedForeignViewZoneInAddedRegion();
-				}
-
-				stepOriginal.push({
-					afterLineNumber: viewZoneLineNumber,
-					heightInLines: modifiedForeignVZ.current.height / modifiedLineHeight,
-					domNode: null,
-					marginDomNode: marginDomNode
-				});
-				modifiedForeignVZ.advance();
-			}
-
-			// [PRODUCE] View zone(s) in modified-side due to foreign view zone(s) in original-side
-			while (originalForeignVZ.current && originalForeignVZ.current.afterLineNumber <= originalEndEquivalentLineNumber) {
-				let viewZoneLineNumber: number;
-				if (originalForeignVZ.current.afterLineNumber <= originalEquivalentLineNumber) {
-					viewZoneLineNumber = modifiedEquivalentLineNumber - originalEquivalentLineNumber + originalForeignVZ.current.afterLineNumber;
-				} else {
-					viewZoneLineNumber = modifiedEndEquivalentLineNumber;
-				}
-				stepModified.push({
-					afterLineNumber: viewZoneLineNumber,
-					heightInLines: originalForeignVZ.current.height / originalLineHeight,
-					domNode: null
-				});
-				originalForeignVZ.advance();
-			}
-
-			if (lineChange !== null && isChangeOrInsert(lineChange)) {
-				const r = this._produceOriginalFromDiff(lineChange, lineChangeOriginalLength, lineChangeModifiedLength);
-				if (r) {
-					stepOriginal.push(r);
-				}
-			}
-
-			if (lineChange !== null && isChangeOrDelete(lineChange)) {
-				const r = this._produceModifiedFromDiff(lineChange, lineChangeOriginalLength, lineChangeModifiedLength);
-				if (r) {
-					stepModified.push(r);
-				}
-			}
-
-			// ---------------------------- END PRODUCE VIEW ZONES
-
-
-			// ---------------------------- EMIT MINIMAL VIEW ZONES
-
-			// [CANCEL & EMIT] Try to cancel view zones out
-			let stepOriginalIndex = 0;
-			let stepModifiedIndex = 0;
-
-			stepOriginal = stepOriginal.sort(sortMyViewZones);
-			stepModified = stepModified.sort(sortMyViewZones);
-
-			while (stepOriginalIndex < stepOriginal.length && stepModifiedIndex < stepModified.length) {
-				const original = stepOriginal[stepOriginalIndex];
-				const modified = stepModified[stepModifiedIndex];
-
-				const originalDelta = original.afterLineNumber - originalEquivalentLineNumber;
-				const modifiedDelta = modified.afterLineNumber - modifiedEquivalentLineNumber;
-
-				if (originalDelta < modifiedDelta) {
-					addAndCombineIfPossible(result.original, original);
-					stepOriginalIndex++;
-				} else if (modifiedDelta < originalDelta) {
-					addAndCombineIfPossible(result.modified, modified);
-					stepModifiedIndex++;
-				} else if (original.shouldNotShrink) {
-					addAndCombineIfPossible(result.original, original);
-					stepOriginalIndex++;
-				} else if (modified.shouldNotShrink) {
-					addAndCombineIfPossible(result.modified, modified);
-					stepModifiedIndex++;
-				} else {
-					if (original.heightInLines >= modified.heightInLines) {
-						// modified view zone gets removed
-						original.heightInLines -= modified.heightInLines;
-						stepModifiedIndex++;
-					} else {
-						// original view zone gets removed
-						modified.heightInLines -= original.heightInLines;
-						stepOriginalIndex++;
-					}
-				}
-			}
-
-			// [EMIT] Remaining original view zones
-			while (stepOriginalIndex < stepOriginal.length) {
-				addAndCombineIfPossible(result.original, stepOriginal[stepOriginalIndex]);
-				stepOriginalIndex++;
-			}
-
-			// [EMIT] Remaining modified view zones
-			while (stepModifiedIndex < stepModified.length) {
-				addAndCombineIfPossible(result.modified, stepModified[stepModifiedIndex]);
-				stepModifiedIndex++;
-			}
-
-			// ---------------------------- END EMIT MINIMAL VIEW ZONES
-		}
-
-		return {
-			original: ViewZonesComputer._ensureDomNodes(result.original),
-			modified: ViewZonesComputer._ensureDomNodes(result.modified),
-		};
-	}
-
-	private static _ensureDomNodes(zones: IMyViewZone[]): IMyViewZone[] {
-		return zones.map((z) => {
-			if (!z.domNode) {
-				z.domNode = createFakeLinesDiv();
-			}
-			return z;
-		});
-	}
-
-	protected abstract _createOriginalMarginDomNodeForModifiedForeignViewZoneInAddedRegion(): HTMLDivElement | null;
-
-	protected abstract _produceOriginalFromDiff(lineChange: ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone | null;
-
-	protected abstract _produceModifiedFromDiff(lineChange: ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone | null;
-}
-
-function createDecoration(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, options: ModelDecorationOptions) {
-	return {
-		range: new Range(startLineNumber, startColumn, endLineNumber, endColumn),
-		options: options
-	};
-}
-
-const enum DiffEditorLineClasses {
-	Insert = 'line-insert',
-	Delete = 'line-delete'
-}
-
-const DECORATIONS = {
-
-	arrowRevertChange: ModelDecorationOptions.register({
-		description: 'diff-editor-arrow-revert-change',
-		glyphMarginHoverMessage: new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true }).appendMarkdown(nls.localize('revertChangeHoverMessage', 'Click to revert change')),
-		glyphMarginClassName: 'arrow-revert-change ' + ThemeIcon.asClassName(Codicon.arrowRight),
-		zIndex: 10001,
-	}),
-
-	charDelete: ModelDecorationOptions.register({
-		description: 'diff-editor-char-delete',
-		className: 'char-delete'
-	}),
-	charDeleteWholeLine: ModelDecorationOptions.register({
-		description: 'diff-editor-char-delete-whole-line',
-		className: 'char-delete',
-		isWholeLine: true
-	}),
-
-	charInsert: ModelDecorationOptions.register({
-		description: 'diff-editor-char-insert',
-		className: 'char-insert'
-	}),
-	charInsertWholeLine: ModelDecorationOptions.register({
-		description: 'diff-editor-char-insert-whole-line',
-		className: 'char-insert',
-		isWholeLine: true
-	}),
-
-	lineInsert: ModelDecorationOptions.register({
-		description: 'diff-editor-line-insert',
-		className: DiffEditorLineClasses.Insert,
-		marginClassName: 'gutter-insert',
-		isWholeLine: true
-	}),
-	lineInsertWithSign: ModelDecorationOptions.register({
-		description: 'diff-editor-line-insert-with-sign',
-		className: DiffEditorLineClasses.Insert,
-		linesDecorationsClassName: 'insert-sign ' + ThemeIcon.asClassName(diffInsertIcon),
-		marginClassName: 'gutter-insert',
-		isWholeLine: true
-	}),
-
-	lineDelete: ModelDecorationOptions.register({
-		description: 'diff-editor-line-delete',
-		className: DiffEditorLineClasses.Delete,
-		marginClassName: 'gutter-delete',
-		isWholeLine: true
-	}),
-	lineDeleteWithSign: ModelDecorationOptions.register({
-		description: 'diff-editor-line-delete-with-sign',
-		className: DiffEditorLineClasses.Delete,
-		linesDecorationsClassName: 'delete-sign ' + ThemeIcon.asClassName(diffRemoveIcon),
-		marginClassName: 'gutter-delete',
-		isWholeLine: true
-
-	}),
-	lineDeleteMargin: ModelDecorationOptions.register({
-		description: 'diff-editor-line-delete-margin',
-		marginClassName: 'gutter-delete',
-	})
-
-};
-
-class DiffEditorWidgetSideBySide extends DiffEditorWidgetStyle implements IVerticalSashLayoutProvider {
-
-	static readonly MINIMUM_EDITOR_WIDTH = 100;
-
-	private _disableSash: boolean;
-	private readonly _sash: Sash;
-	private _defaultRatio: number;
-	private _sashRatio: number | null;
-	private _sashPosition: number | null;
-	private _startSashPosition: number | null;
-
-	constructor(dataSource: IDataSource, enableSplitViewResizing: boolean, defaultSashRatio: number) {
-		super(dataSource);
-
-		this._disableSash = (enableSplitViewResizing === false);
-		this._defaultRatio = defaultSashRatio;
-		this._sashRatio = null;
-		this._sashPosition = null;
-		this._startSashPosition = null;
-		this._sash = this._register(new Sash(this._dataSource.getContainerDomNode(), this, { orientation: Orientation.VERTICAL }));
-
-		if (this._disableSash) {
-			this._sash.state = SashState.Disabled;
-		}
-
-		this._sash.onDidStart(() => this._onSashDragStart());
-		this._sash.onDidChange((e: ISashEvent) => this._onSashDrag(e));
-		this._sash.onDidEnd(() => this._onSashDragEnd());
-		this._sash.onDidReset(() => this._onSashReset());
-	}
-
-	public setEnableSplitViewResizing(enableSplitViewResizing: boolean, defaultRatio: number): void {
-		this._defaultRatio = defaultRatio;
-		const newDisableSash = (enableSplitViewResizing === false);
-		if (this._disableSash !== newDisableSash) {
-			this._disableSash = newDisableSash;
-			this._sash.state = this._disableSash ? SashState.Disabled : SashState.Enabled;
-		}
-	}
-
-	public layout(sashRatio: number | null = this._sashRatio || this._defaultRatio): number {
-		const w = this._dataSource.getWidth();
-		const contentWidth = w - (this._dataSource.getOptions().renderOverviewRuler ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0);
-
-		let sashPosition = Math.floor((sashRatio || this._defaultRatio) * contentWidth);
-		const midPoint = Math.floor(this._defaultRatio * contentWidth);
-
-		sashPosition = this._disableSash ? midPoint : sashPosition || midPoint;
-
-		if (contentWidth > DiffEditorWidgetSideBySide.MINIMUM_EDITOR_WIDTH * 2) {
-			if (sashPosition < DiffEditorWidgetSideBySide.MINIMUM_EDITOR_WIDTH) {
-				sashPosition = DiffEditorWidgetSideBySide.MINIMUM_EDITOR_WIDTH;
-			}
-
-			if (sashPosition > contentWidth - DiffEditorWidgetSideBySide.MINIMUM_EDITOR_WIDTH) {
-				sashPosition = contentWidth - DiffEditorWidgetSideBySide.MINIMUM_EDITOR_WIDTH;
-			}
-		} else {
-			sashPosition = midPoint;
-		}
-
-		if (this._sashPosition !== sashPosition) {
-			this._sashPosition = sashPosition;
-		}
-		this._sash.layout();
-
-		return this._sashPosition;
-	}
-
-	private _onSashDragStart(): void {
-		this._startSashPosition = this._sashPosition!;
-	}
-
-	private _onSashDrag(e: ISashEvent): void {
-		const w = this._dataSource.getWidth();
-		const contentWidth = w - (this._dataSource.getOptions().renderOverviewRuler ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0);
-		const sashPosition = this.layout((this._startSashPosition! + (e.currentX - e.startX)) / contentWidth);
-
-		this._sashRatio = sashPosition / contentWidth;
-
-		this._dataSource.relayoutEditors();
-	}
-
-	private _onSashDragEnd(): void {
-		this._sash.layout();
-	}
-
-	private _onSashReset(): void {
-		this._sashRatio = this._defaultRatio;
-		this._dataSource.relayoutEditors();
-		this._sash.layout();
-	}
-
-	public getVerticalSashTop(sash: Sash): number {
-		return 0;
-	}
-
-	public getVerticalSashLeft(sash: Sash): number {
-		return this._sashPosition!;
-	}
-
-	public getVerticalSashHeight(sash: Sash): number {
-		return this._dataSource.getHeight();
-	}
-
-	override setBoundarySashes(sashes: IBoundarySashes) {
-		this._sash.orthogonalEndSash = sashes.bottom;
-	}
-
-	protected _getViewZones(lineChanges: ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[]): IEditorsZones {
-		const originalEditor = this._dataSource.getOriginalEditor();
-		const modifiedEditor = this._dataSource.getModifiedEditor();
-		const c = new SideBySideViewZonesComputer(lineChanges, originalForeignVZ, modifiedForeignVZ, originalEditor, modifiedEditor);
-		return c.getViewZones();
-	}
-
-	protected _getOriginalEditorDecorations(zones: IEditorsZones, lineChanges: ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean): IEditorDiffDecorations {
-		const originalEditor = this._dataSource.getOriginalEditor();
-		const overviewZoneColor = String(this._removeColor);
-
-		const result: IEditorDiffDecorations = {
-			decorations: [],
-			overviewZones: []
-		};
-
-		const originalModel = originalEditor.getModel()!;
-		const originalViewModel = originalEditor._getViewModel()!;
-
-		for (const lineChange of lineChanges) {
-
-			if (isChangeOrDelete(lineChange)) {
-				result.decorations.push({
-					range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Constants.MAX_SAFE_SMALL_INTEGER),
-					options: (renderIndicators ? DECORATIONS.lineDeleteWithSign : DECORATIONS.lineDelete)
-				});
-				if (!isChangeOrInsert(lineChange) || !lineChange.charChanges) {
-					result.decorations.push(createDecoration(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Constants.MAX_SAFE_SMALL_INTEGER, DECORATIONS.charDeleteWholeLine));
-				}
-
-				const viewRange = getViewRange(originalModel, originalViewModel, lineChange.originalStartLineNumber, lineChange.originalEndLineNumber);
-				result.overviewZones.push(new OverviewRulerZone(viewRange.startLineNumber, viewRange.endLineNumber, /*use endLineNumber*/0, overviewZoneColor));
-
-				if (lineChange.charChanges) {
-					for (const charChange of lineChange.charChanges) {
-						if (isCharChangeOrDelete(charChange)) {
-							if (ignoreTrimWhitespace) {
-								for (let lineNumber = charChange.originalStartLineNumber; lineNumber <= charChange.originalEndLineNumber; lineNumber++) {
-									let startColumn: number;
-									let endColumn: number;
-									if (lineNumber === charChange.originalStartLineNumber) {
-										startColumn = charChange.originalStartColumn;
-									} else {
-										startColumn = originalModel.getLineFirstNonWhitespaceColumn(lineNumber);
-									}
-									if (lineNumber === charChange.originalEndLineNumber) {
-										endColumn = charChange.originalEndColumn;
-									} else {
-										endColumn = originalModel.getLineLastNonWhitespaceColumn(lineNumber);
-									}
-									result.decorations.push(createDecoration(lineNumber, startColumn, lineNumber, endColumn, DECORATIONS.charDelete));
-								}
-							} else {
-								result.decorations.push(createDecoration(charChange.originalStartLineNumber, charChange.originalStartColumn, charChange.originalEndLineNumber, charChange.originalEndColumn, DECORATIONS.charDelete));
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	protected _getModifiedEditorDecorations(zones: IEditorsZones, lineChanges: ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, renderMarginRevertIcon: boolean): IEditorDiffDecorations {
-		const modifiedEditor = this._dataSource.getModifiedEditor();
-		const overviewZoneColor = String(this._insertColor);
-
-		const result: IEditorDiffDecorations = {
-			decorations: [],
-			overviewZones: []
-		};
-
-		const modifiedModel = modifiedEditor.getModel()!;
-		const modifiedViewModel = modifiedEditor._getViewModel()!;
-
-		for (const lineChange of lineChanges) {
-
-			// Arrows for reverting changes.
-			if (renderMarginRevertIcon) {
-				if (lineChange.modifiedEndLineNumber > 0) {
-					result.decorations.push({
-						range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedStartLineNumber, 1),
-						options: DECORATIONS.arrowRevertChange
-					});
-				} else {
-					const viewZone = zones.modified.find(z => z.afterLineNumber === lineChange.modifiedStartLineNumber);
-					if (viewZone) {
-						viewZone.marginDomNode = createViewZoneMarginArrow();
-					}
-				}
-			}
-
-			if (isChangeOrInsert(lineChange)) {
-
-				result.decorations.push({
-					range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Constants.MAX_SAFE_SMALL_INTEGER),
-					options: (renderIndicators ? DECORATIONS.lineInsertWithSign : DECORATIONS.lineInsert)
-				});
-				if (!isChangeOrDelete(lineChange) || !lineChange.charChanges) {
-					result.decorations.push(createDecoration(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Constants.MAX_SAFE_SMALL_INTEGER, DECORATIONS.charInsertWholeLine));
-				}
-
-				const viewRange = getViewRange(modifiedModel, modifiedViewModel, lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber);
-				result.overviewZones.push(new OverviewRulerZone(viewRange.startLineNumber, viewRange.endLineNumber,/*use endLineNumber*/0, overviewZoneColor));
-
-				if (lineChange.charChanges) {
-					for (const charChange of lineChange.charChanges) {
-						if (isCharChangeOrInsert(charChange)) {
-							if (ignoreTrimWhitespace) {
-								for (let lineNumber = charChange.modifiedStartLineNumber; lineNumber <= charChange.modifiedEndLineNumber; lineNumber++) {
-									let startColumn: number;
-									let endColumn: number;
-									if (lineNumber === charChange.modifiedStartLineNumber) {
-										startColumn = charChange.modifiedStartColumn;
-									} else {
-										startColumn = modifiedModel.getLineFirstNonWhitespaceColumn(lineNumber);
-									}
-									if (lineNumber === charChange.modifiedEndLineNumber) {
-										endColumn = charChange.modifiedEndColumn;
-									} else {
-										endColumn = modifiedModel.getLineLastNonWhitespaceColumn(lineNumber);
-									}
-									result.decorations.push(createDecoration(lineNumber, startColumn, lineNumber, endColumn, DECORATIONS.charInsert));
-								}
-							} else {
-								result.decorations.push(createDecoration(charChange.modifiedStartLineNumber, charChange.modifiedStartColumn, charChange.modifiedEndLineNumber, charChange.modifiedEndColumn, DECORATIONS.charInsert));
-							}
-						}
-					}
-				}
-
-			}
-		}
-		return result;
-	}
-}
-
-class SideBySideViewZonesComputer extends ViewZonesComputer {
-
-	constructor(
-		lineChanges: ILineChange[],
-		originalForeignVZ: IEditorWhitespace[],
-		modifiedForeignVZ: IEditorWhitespace[],
-		originalEditor: CodeEditorWidget,
-		modifiedEditor: CodeEditorWidget,
-	) {
-		super(lineChanges, originalForeignVZ, modifiedForeignVZ, originalEditor, modifiedEditor);
-	}
-
-	protected _createOriginalMarginDomNodeForModifiedForeignViewZoneInAddedRegion(): HTMLDivElement | null {
-		return null;
-	}
-
-	protected _produceOriginalFromDiff(lineChange: ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone | null {
-		if (lineChangeModifiedLength > lineChangeOriginalLength) {
-			return {
-				afterLineNumber: Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber),
-				heightInLines: (lineChangeModifiedLength - lineChangeOriginalLength),
-				domNode: null
-			};
-		}
-		return null;
-	}
-
-	protected _produceModifiedFromDiff(lineChange: ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone | null {
-		if (lineChangeOriginalLength > lineChangeModifiedLength) {
-			return {
-				afterLineNumber: Math.max(lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber),
-				heightInLines: (lineChangeOriginalLength - lineChangeModifiedLength),
-				domNode: null
-			};
-		}
-		return null;
-	}
-}
-
-class DiffEditorWidgetInline extends DiffEditorWidgetStyle {
-
-	private _decorationsLeft: number;
-
-	constructor(dataSource: IDataSource, enableSplitViewResizing: boolean) {
-		super(dataSource);
-
-		this._decorationsLeft = dataSource.getOriginalEditor().getLayoutInfo().decorationsLeft;
-
-		this._register(dataSource.getOriginalEditor().onDidLayoutChange((layoutInfo: EditorLayoutInfo) => {
-			if (this._decorationsLeft !== layoutInfo.decorationsLeft) {
-				this._decorationsLeft = layoutInfo.decorationsLeft;
-				dataSource.relayoutEditors();
-			}
-		}));
-	}
-
-	public setEnableSplitViewResizing(enableSplitViewResizing: boolean): void {
-		// Nothing to do..
-	}
-
-	protected _getViewZones(lineChanges: ILineChange[], originalForeignVZ: IEditorWhitespace[], modifiedForeignVZ: IEditorWhitespace[], renderIndicators: boolean): IEditorsZones {
-		const originalEditor = this._dataSource.getOriginalEditor();
-		const modifiedEditor = this._dataSource.getModifiedEditor();
-		const computer = new InlineViewZonesComputer(lineChanges, originalForeignVZ, modifiedForeignVZ, originalEditor, modifiedEditor, renderIndicators);
-		return computer.getViewZones();
-	}
-
-	protected _getOriginalEditorDecorations(zones: IEditorsZones, lineChanges: ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean): IEditorDiffDecorations {
-		const overviewZoneColor = String(this._removeColor);
-
-		const result: IEditorDiffDecorations = {
-			decorations: [],
-			overviewZones: []
-		};
-
-		const originalEditor = this._dataSource.getOriginalEditor();
-		const originalModel = originalEditor.getModel()!;
-		const originalViewModel = originalEditor._getViewModel()!;
-		let zoneIndex = 0;
-
-		for (const lineChange of lineChanges) {
-
-			// Add overview zones in the overview ruler
-			if (isChangeOrDelete(lineChange)) {
-				result.decorations.push({
-					range: new Range(lineChange.originalStartLineNumber, 1, lineChange.originalEndLineNumber, Constants.MAX_SAFE_SMALL_INTEGER),
-					options: DECORATIONS.lineDeleteMargin
-				});
-
-				while (zoneIndex < zones.modified.length) {
-					const zone = zones.modified[zoneIndex];
-					if (zone.diff && zone.diff.originalStartLineNumber >= lineChange.originalStartLineNumber) {
-						break;
-					}
-					zoneIndex++;
-				}
-
-				let zoneHeightInLines = 0;
-				if (zoneIndex < zones.modified.length) {
-					const zone = zones.modified[zoneIndex];
-					if (
-						zone.diff
-						&& zone.diff.originalStartLineNumber === lineChange.originalStartLineNumber
-						&& zone.diff.originalEndLineNumber === lineChange.originalEndLineNumber
-						&& zone.diff.modifiedStartLineNumber === lineChange.modifiedStartLineNumber
-						&& zone.diff.modifiedEndLineNumber === lineChange.modifiedEndLineNumber
-					) {
-						zoneHeightInLines = zone.heightInLines;
-					}
-				}
-
-				const viewRange = getViewRange(originalModel, originalViewModel, lineChange.originalStartLineNumber, lineChange.originalEndLineNumber);
-				result.overviewZones.push(new OverviewRulerZone(viewRange.startLineNumber, viewRange.endLineNumber, zoneHeightInLines, overviewZoneColor));
-			}
-		}
-
-		return result;
-	}
-
-	protected _getModifiedEditorDecorations(zones: IEditorsZones, lineChanges: ILineChange[], ignoreTrimWhitespace: boolean, renderIndicators: boolean, renderMarginRevertIcon: boolean): IEditorDiffDecorations {
-		const modifiedEditor = this._dataSource.getModifiedEditor();
-		const overviewZoneColor = String(this._insertColor);
-
-		const result: IEditorDiffDecorations = {
-			decorations: [],
-			overviewZones: []
-		};
-
-		const modifiedModel = modifiedEditor.getModel()!;
-		const modifiedViewModel = modifiedEditor._getViewModel()!;
-
-		for (const lineChange of lineChanges) {
-
-			// Add decorations & overview zones
-			if (isChangeOrInsert(lineChange)) {
-				result.decorations.push({
-					range: new Range(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Constants.MAX_SAFE_SMALL_INTEGER),
-					options: (renderIndicators ? DECORATIONS.lineInsertWithSign : DECORATIONS.lineInsert)
-				});
-
-				const viewRange = getViewRange(modifiedModel, modifiedViewModel, lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber);
-				result.overviewZones.push(new OverviewRulerZone(viewRange.startLineNumber, viewRange.endLineNumber, /*use endLineNumber*/0, overviewZoneColor));
-
-				if (lineChange.charChanges) {
-					for (const charChange of lineChange.charChanges) {
-						if (isCharChangeOrInsert(charChange)) {
-							if (ignoreTrimWhitespace) {
-								for (let lineNumber = charChange.modifiedStartLineNumber; lineNumber <= charChange.modifiedEndLineNumber; lineNumber++) {
-									let startColumn: number;
-									let endColumn: number;
-									if (lineNumber === charChange.modifiedStartLineNumber) {
-										startColumn = charChange.modifiedStartColumn;
-									} else {
-										startColumn = modifiedModel.getLineFirstNonWhitespaceColumn(lineNumber);
-									}
-									if (lineNumber === charChange.modifiedEndLineNumber) {
-										endColumn = charChange.modifiedEndColumn;
-									} else {
-										endColumn = modifiedModel.getLineLastNonWhitespaceColumn(lineNumber);
-									}
-									result.decorations.push(createDecoration(lineNumber, startColumn, lineNumber, endColumn, DECORATIONS.charInsert));
-								}
-							} else {
-								result.decorations.push(createDecoration(charChange.modifiedStartLineNumber, charChange.modifiedStartColumn, charChange.modifiedEndLineNumber, charChange.modifiedEndColumn, DECORATIONS.charInsert));
-							}
-						}
-					}
-				} else {
-					result.decorations.push(createDecoration(lineChange.modifiedStartLineNumber, 1, lineChange.modifiedEndLineNumber, Constants.MAX_SAFE_SMALL_INTEGER, DECORATIONS.charInsertWholeLine));
-				}
-			}
-		}
-
-		return result;
-	}
-
-	public layout(): number {
-		// An editor should not be smaller than 5px
-		return Math.max(5, this._decorationsLeft);
-	}
-
-}
-
-interface InlineModifiedViewZone extends IMyViewZone {
-	shouldNotShrink: boolean;
-	afterLineNumber: number;
-	heightInLines: number;
-	minWidthInPx: number;
-	domNode: HTMLElement;
-	marginDomNode: HTMLElement;
-	diff: IDiffLinesChange;
-}
-
-class InlineViewZonesComputer extends ViewZonesComputer {
-
-	private readonly _originalModel: ITextModel;
-	private readonly _renderIndicators: boolean;
-	private readonly _pendingLineChange: ILineChange[];
-	private readonly _pendingViewZones: InlineModifiedViewZone[];
-	private readonly _lineBreaksComputer: ILineBreaksComputer;
-
-	constructor(
-		lineChanges: ILineChange[],
-		originalForeignVZ: IEditorWhitespace[],
-		modifiedForeignVZ: IEditorWhitespace[],
-		originalEditor: CodeEditorWidget,
-		modifiedEditor: CodeEditorWidget,
-		renderIndicators: boolean
-	) {
-		super(lineChanges, originalForeignVZ, modifiedForeignVZ, originalEditor, modifiedEditor);
-		this._originalModel = originalEditor.getModel()!;
-		this._renderIndicators = renderIndicators;
-		this._pendingLineChange = [];
-		this._pendingViewZones = [];
-		this._lineBreaksComputer = this._modifiedEditor._getViewModel()!.createLineBreaksComputer();
-	}
-
-	public override getViewZones(): IEditorsZones {
-		const result = super.getViewZones();
-		this._finalize(result);
-		return result;
-	}
-
-	protected _createOriginalMarginDomNodeForModifiedForeignViewZoneInAddedRegion(): HTMLDivElement | null {
-		const result = document.createElement('div');
-		result.className = 'inline-added-margin-view-zone';
-		return result;
-	}
-
-	protected _produceOriginalFromDiff(lineChange: ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone | null {
-		const marginDomNode = document.createElement('div');
-		marginDomNode.className = 'inline-added-margin-view-zone';
-
-		return {
-			afterLineNumber: Math.max(lineChange.originalStartLineNumber, lineChange.originalEndLineNumber),
-			heightInLines: lineChangeModifiedLength,
-			domNode: document.createElement('div'),
-			marginDomNode: marginDomNode
-		};
-	}
-
-	protected _produceModifiedFromDiff(lineChange: ILineChange, lineChangeOriginalLength: number, lineChangeModifiedLength: number): IMyViewZone | null {
-		const domNode = document.createElement('div');
-		domNode.className = `view-lines line-delete ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`;
-
-		const marginDomNode = document.createElement('div');
-		marginDomNode.className = 'inline-deleted-margin-view-zone';
-
-		const viewZone: InlineModifiedViewZone = {
-			shouldNotShrink: true,
-			afterLineNumber: (lineChange.modifiedEndLineNumber === 0 ? lineChange.modifiedStartLineNumber : lineChange.modifiedStartLineNumber - 1),
-			heightInLines: lineChangeOriginalLength,
-			minWidthInPx: 0,
-			domNode: domNode,
-			marginDomNode: marginDomNode,
-			diff: {
-				originalStartLineNumber: lineChange.originalStartLineNumber,
-				originalEndLineNumber: lineChange.originalEndLineNumber,
-				modifiedStartLineNumber: lineChange.modifiedStartLineNumber,
-				modifiedEndLineNumber: lineChange.modifiedEndLineNumber,
-				originalModel: this._originalModel,
-				viewLineCounts: null,
-			}
-		};
-
-		for (let lineNumber = lineChange.originalStartLineNumber; lineNumber <= lineChange.originalEndLineNumber; lineNumber++) {
-			this._lineBreaksComputer.addRequest(this._originalModel.getLineContent(lineNumber), null, null);
-		}
-
-		this._pendingLineChange.push(lineChange);
-		this._pendingViewZones.push(viewZone);
-
-		return viewZone;
-	}
-
-	private _finalize(result: IEditorsZones): void {
-		const modifiedEditorOptions = this._modifiedEditor.getOptions();
-		const tabSize = this._modifiedEditor.getModel()!.getOptions().tabSize;
-		const fontInfo = modifiedEditorOptions.get(EditorOption.fontInfo);
-		const disableMonospaceOptimizations = modifiedEditorOptions.get(EditorOption.disableMonospaceOptimizations);
-		const typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
-		const scrollBeyondLastColumn = modifiedEditorOptions.get(EditorOption.scrollBeyondLastColumn);
-		const mightContainNonBasicASCII = this._originalModel.mightContainNonBasicASCII();
-		const mightContainRTL = this._originalModel.mightContainRTL();
-		const lineHeight = modifiedEditorOptions.get(EditorOption.lineHeight);
-		const layoutInfo = modifiedEditorOptions.get(EditorOption.layoutInfo);
-		const lineDecorationsWidth = layoutInfo.decorationsWidth;
-		const stopRenderingLineAfter = modifiedEditorOptions.get(EditorOption.stopRenderingLineAfter);
-		const renderWhitespace = modifiedEditorOptions.get(EditorOption.renderWhitespace);
-		const renderControlCharacters = modifiedEditorOptions.get(EditorOption.renderControlCharacters);
-		const fontLigatures = modifiedEditorOptions.get(EditorOption.fontLigatures);
-
-		const lineBreaks = this._lineBreaksComputer.finalize();
-		let lineBreakIndex = 0;
-
-		for (let i = 0; i < this._pendingLineChange.length; i++) {
-			const lineChange = this._pendingLineChange[i];
-			const viewZone = this._pendingViewZones[i];
-			const domNode = viewZone.domNode;
-			applyFontInfo(domNode, fontInfo);
-
-			const marginDomNode = viewZone.marginDomNode;
-			applyFontInfo(marginDomNode, fontInfo);
-
-			const decorations: InlineDecoration[] = [];
-			if (lineChange.charChanges) {
-				for (const charChange of lineChange.charChanges) {
-					if (isCharChangeOrDelete(charChange)) {
-						decorations.push(new InlineDecoration(
-							new Range(charChange.originalStartLineNumber, charChange.originalStartColumn, charChange.originalEndLineNumber, charChange.originalEndColumn),
-							'char-delete',
-							InlineDecorationType.Regular
-						));
-					}
-				}
-			}
-			const hasCharChanges = (decorations.length > 0);
-
-			const sb = new StringBuilder(10000);
-			let maxCharsPerLine = 0;
-			let renderedLineCount = 0;
-			let viewLineCounts: number[] | null = null;
-			for (let lineNumber = lineChange.originalStartLineNumber; lineNumber <= lineChange.originalEndLineNumber; lineNumber++) {
-				const lineIndex = lineNumber - lineChange.originalStartLineNumber;
-				const lineTokens = this._originalModel.tokenization.getLineTokens(lineNumber);
-				const lineContent = lineTokens.getLineContent();
-				const lineBreakData = lineBreaks[lineBreakIndex++];
-				const actualDecorations = LineDecoration.filter(decorations, lineNumber, 1, lineContent.length + 1);
-
-				if (lineBreakData) {
-					let lastBreakOffset = 0;
-					for (const breakOffset of lineBreakData.breakOffsets) {
-						const viewLineTokens = lineTokens.sliceAndInflate(lastBreakOffset, breakOffset, 0);
-						const viewLineContent = lineContent.substring(lastBreakOffset, breakOffset);
-						maxCharsPerLine = Math.max(maxCharsPerLine, this._renderOriginalLine(
-							renderedLineCount++,
-							viewLineContent,
-							viewLineTokens,
-							LineDecoration.extractWrapped(actualDecorations, lastBreakOffset, breakOffset),
-							hasCharChanges,
-							mightContainNonBasicASCII,
-							mightContainRTL,
-							fontInfo,
-							disableMonospaceOptimizations,
-							lineHeight,
-							lineDecorationsWidth,
-							stopRenderingLineAfter,
-							renderWhitespace,
-							renderControlCharacters,
-							fontLigatures,
-							tabSize,
-							sb,
-							marginDomNode
-						));
-						lastBreakOffset = breakOffset;
-					}
-					if (!viewLineCounts) {
-						viewLineCounts = [];
-					}
-					// make sure all lines before this one have an entry in `viewLineCounts`
-					while (viewLineCounts.length < lineIndex) {
-						viewLineCounts[viewLineCounts.length] = 1;
-					}
-					viewLineCounts[lineIndex] = lineBreakData.breakOffsets.length;
-					viewZone.heightInLines += (lineBreakData.breakOffsets.length - 1);
-					const marginDomNode2 = document.createElement('div');
-					marginDomNode2.className = 'gutter-delete';
-					result.original.push({
-						afterLineNumber: lineNumber,
-						afterColumn: 0,
-						heightInLines: lineBreakData.breakOffsets.length - 1,
-						domNode: createFakeLinesDiv(),
-						marginDomNode: marginDomNode2
-					});
-				} else {
-					maxCharsPerLine = Math.max(maxCharsPerLine, this._renderOriginalLine(
-						renderedLineCount++,
-						lineContent,
-						lineTokens,
-						actualDecorations,
-						hasCharChanges,
-						mightContainNonBasicASCII,
-						mightContainRTL,
-						fontInfo,
-						disableMonospaceOptimizations,
-						lineHeight,
-						lineDecorationsWidth,
-						stopRenderingLineAfter,
-						renderWhitespace,
-						renderControlCharacters,
-						fontLigatures,
-						tabSize,
-						sb,
-						marginDomNode
-					));
-				}
-			}
-			maxCharsPerLine += scrollBeyondLastColumn;
-
-			const html = sb.build();
-			const trustedhtml = diffEditorWidgetTtPolicy ? diffEditorWidgetTtPolicy.createHTML(html) : html;
-			domNode.innerHTML = trustedhtml as string;
-			viewZone.minWidthInPx = (maxCharsPerLine * typicalHalfwidthCharacterWidth);
-
-			if (viewLineCounts) {
-				// make sure all lines have an entry in `viewLineCounts`
-				const cnt = lineChange.originalEndLineNumber - lineChange.originalStartLineNumber;
-				while (viewLineCounts.length <= cnt) {
-					viewLineCounts[viewLineCounts.length] = 1;
-				}
-			}
-			viewZone.diff.viewLineCounts = viewLineCounts;
-		}
-
-		result.original.sort((a, b) => {
-			return a.afterLineNumber - b.afterLineNumber;
-		});
-	}
-
-	private _renderOriginalLine(
-		renderedLineCount: number,
-		lineContent: string,
-		lineTokens: IViewLineTokens,
-		decorations: LineDecoration[],
-		hasCharChanges: boolean,
-		mightContainNonBasicASCII: boolean,
-		mightContainRTL: boolean,
-		fontInfo: FontInfo,
-		disableMonospaceOptimizations: boolean,
-		lineHeight: number,
-		lineDecorationsWidth: number,
-		stopRenderingLineAfter: number,
-		renderWhitespace: 'selection' | 'none' | 'boundary' | 'trailing' | 'all',
-		renderControlCharacters: boolean,
-		fontLigatures: string,
-		tabSize: number,
-		sb: StringBuilder,
-		marginDomNode: HTMLElement
-	): number {
-
-		sb.appendString('<div class="view-line');
-		if (!hasCharChanges) {
-			// No char changes
-			sb.appendString(' char-delete');
-		}
-		sb.appendString('" style="top:');
-		sb.appendString(String(renderedLineCount * lineHeight));
-		sb.appendString('px;width:1000000px;">');
-
-		const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, mightContainNonBasicASCII);
-		const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, mightContainRTL);
-		const output = renderViewLine(new RenderLineInput(
-			(fontInfo.isMonospace && !disableMonospaceOptimizations),
-			fontInfo.canUseHalfwidthRightwardsArrow,
-			lineContent,
-			false,
-			isBasicASCII,
-			containsRTL,
-			0,
-			lineTokens,
-			decorations,
-			tabSize,
-			0,
-			fontInfo.spaceWidth,
-			fontInfo.middotWidth,
-			fontInfo.wsmiddotWidth,
-			stopRenderingLineAfter,
-			renderWhitespace,
-			renderControlCharacters,
-			fontLigatures !== EditorFontLigatures.OFF,
-			null // Send no selections, original line cannot be selected
-		), sb);
-
-		sb.appendString('</div>');
-
-		if (this._renderIndicators) {
-			const marginElement = document.createElement('div');
-			marginElement.className = `delete-sign ${ThemeIcon.asClassName(diffRemoveIcon)}`;
-			marginElement.setAttribute('style', `position:absolute;top:${renderedLineCount * lineHeight}px;width:${lineDecorationsWidth}px;height:${lineHeight}px;right:0;`);
-			marginDomNode.appendChild(marginElement);
-		}
-
-		return output.characterMapping.getHorizontalOffset(output.characterMapping.length);
-	}
-}
-
-function validateDiffWordWrap(value: 'off' | 'on' | 'inherit' | undefined, defaultValue: 'off' | 'on' | 'inherit'): 'off' | 'on' | 'inherit' {
-	return validateStringSetOption<'off' | 'on' | 'inherit'>(value, defaultValue, ['off', 'on', 'inherit']);
-}
-
-function isChangeOrInsert(lineChange: ILineChange): boolean {
-	return lineChange.modifiedEndLineNumber > 0;
-}
-
-function isChangeOrDelete(lineChange: ILineChange): boolean {
-	return lineChange.originalEndLineNumber > 0;
-}
-
-function isCharChangeOrInsert(charChange: ICharChange): boolean {
-	if (charChange.modifiedStartLineNumber === charChange.modifiedEndLineNumber) {
-		return charChange.modifiedEndColumn - charChange.modifiedStartColumn > 0;
-	}
-	return charChange.modifiedEndLineNumber - charChange.modifiedStartLineNumber > 0;
-}
-
-function isCharChangeOrDelete(charChange: ICharChange): boolean {
-	if (charChange.originalStartLineNumber === charChange.originalEndLineNumber) {
-		return charChange.originalEndColumn - charChange.originalStartColumn > 0;
-	}
-	return charChange.originalEndLineNumber - charChange.originalStartLineNumber > 0;
-}
-
-function createFakeLinesDiv(): HTMLElement {
-	const r = document.createElement('div');
-	r.className = 'diagonal-fill';
-	return r;
-}
-
-function createViewZoneMarginArrow(): HTMLElement {
-	const arrow = document.createElement('div');
-	arrow.className = 'arrow-revert-change ' + ThemeIcon.asClassName(Codicon.arrowRight);
-	return dom.$('div', {}, arrow);
-}
-
-function getViewRange(model: ITextModel, viewModel: IViewModel, startLineNumber: number, endLineNumber: number): Range {
-	const lineCount = model.getLineCount();
-	startLineNumber = Math.min(lineCount, Math.max(1, startLineNumber));
-	endLineNumber = Math.min(lineCount, Math.max(1, endLineNumber));
-	return viewModel.coordinatesConverter.convertModelRangeToViewRange(new Range(
-		startLineNumber, model.getLineMinColumn(startLineNumber),
-		endLineNumber, model.getLineMaxColumn(endLineNumber)
-	));
-}
-
-function validateDiffEditorOptions(options: Readonly<IDiffEditorOptions>, defaults: ValidDiffEditorBaseOptions): ValidDiffEditorBaseOptions {
-	return {
-		enableSplitViewResizing: validateBooleanOption(options.enableSplitViewResizing, defaults.enableSplitViewResizing),
-		splitViewDefaultRatio: clampedFloat(options.splitViewDefaultRatio, 0.5, 0.1, 0.9),
-		renderSideBySide: validateBooleanOption(options.renderSideBySide, defaults.renderSideBySide),
-		renderMarginRevertIcon: validateBooleanOption(options.renderMarginRevertIcon, defaults.renderMarginRevertIcon),
-		maxComputationTime: clampedInt(options.maxComputationTime, defaults.maxComputationTime, 0, Constants.MAX_SAFE_SMALL_INTEGER),
-		maxFileSize: clampedInt(options.maxFileSize, defaults.maxFileSize, 0, Constants.MAX_SAFE_SMALL_INTEGER),
-		ignoreTrimWhitespace: validateBooleanOption(options.ignoreTrimWhitespace, defaults.ignoreTrimWhitespace),
-		renderIndicators: validateBooleanOption(options.renderIndicators, defaults.renderIndicators),
-		originalEditable: validateBooleanOption(options.originalEditable, defaults.originalEditable),
-		diffCodeLens: validateBooleanOption(options.diffCodeLens, defaults.diffCodeLens),
-		renderOverviewRuler: validateBooleanOption(options.renderOverviewRuler, defaults.renderOverviewRuler),
-		diffWordWrap: validateDiffWordWrap(options.diffWordWrap, defaults.diffWordWrap),
-		diffAlgorithm: validateStringSetOption(options.diffAlgorithm, defaults.diffAlgorithm, ['legacy', 'advanced'], { 'smart': 'legacy', 'experimental': 'advanced' }),
-		accessibilityVerbose: validateBooleanOption(options.accessibilityVerbose, defaults.accessibilityVerbose),
-		hideUnchangedRegions: {
-			enabled: false,
-			contextLineCount: 0,
-			minimumLineCount: 0,
-			revealLineCount: 0,
-		},
-		experimental: {
-			showEmptyDecorations: false,
-			showMoves: false,
-		},
-		isInEmbeddedEditor: validateBooleanOption(options.isInEmbeddedEditor, defaults.isInEmbeddedEditor),
-		onlyShowAccessibleDiffViewer: false,
-		renderSideBySideInlineBreakpoint: 0,
-		useInlineViewWhenSpaceIsLimited: false,
-	};
-}
-
-function changedDiffEditorOptions(a: ValidDiffEditorBaseOptions, b: ValidDiffEditorBaseOptions) {
-	return {
-		enableSplitViewResizing: (a.enableSplitViewResizing !== b.enableSplitViewResizing),
-		renderSideBySide: (a.renderSideBySide !== b.renderSideBySide),
-		renderMarginRevertIcon: (a.renderMarginRevertIcon !== b.renderMarginRevertIcon),
-		maxComputationTime: (a.maxComputationTime !== b.maxComputationTime),
-		maxFileSize: (a.maxFileSize !== b.maxFileSize),
-		ignoreTrimWhitespace: (a.ignoreTrimWhitespace !== b.ignoreTrimWhitespace),
-		renderIndicators: (a.renderIndicators !== b.renderIndicators),
-		originalEditable: (a.originalEditable !== b.originalEditable),
-		diffCodeLens: (a.diffCodeLens !== b.diffCodeLens),
-		renderOverviewRuler: (a.renderOverviewRuler !== b.renderOverviewRuler),
-		diffWordWrap: (a.diffWordWrap !== b.diffWordWrap),
-		diffAlgorithm: (a.diffAlgorithm !== b.diffAlgorithm),
-		accessibilityVerbose: (a.accessibilityVerbose !== b.accessibilityVerbose),
-	};
-}
-
-registerThemingParticipant((theme, collector) => {
-	const diffDiagonalFillColor = theme.getColor(diffDiagonalFill);
-	collector.addRule(`
-	.monaco-editor .diagonal-fill {
-		background-image: linear-gradient(
-			-45deg,
-			${diffDiagonalFillColor} 12.5%,
-			#0000 12.5%, #0000 50%,
-			${diffDiagonalFillColor} 50%, ${diffDiagonalFillColor} 62.5%,
-			#0000 62.5%, #0000 100%
-		);
-		background-size: 8px 8px;
-	}
-	`);
-});
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts b/src/vs/editor/browser/widget/diffEditorWidget2/accessibleDiffViewer.ts
index 3f45fae3b99..3b2f9b3204a 100644
--- 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);
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
index 2294861e7af..1166c4522b8 100644
--- 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;
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
index e899a379f99..264b8117601 100644
--- 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();
 	}
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/renderLines.ts b/src/vs/editor/browser/widget/diffEditorWidget2/renderLines.ts
index b33db4762e0..f9d8b3f9a08 100644
--- 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);
diff --git a/src/vs/editor/browser/widget/diffNavigator.ts b/src/vs/editor/browser/widget/diffNavigator.ts
deleted file mode 100644
index 1edce99edf6..00000000000
--- a/src/vs/editor/browser/widget/diffNavigator.ts
+++ /dev/null
@@ -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;
-	}
-}
diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts
deleted file mode 100644
index 268d41d2f3b..00000000000
--- a/src/vs/editor/browser/widget/diffReview.ts
+++ /dev/null
@@ -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
diff --git a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
index d9785bfc8c1..78d8dffd609 100644
--- 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.
  */
diff --git a/src/vs/editor/common/config/editorConfigurationSchema.ts b/src/vs/editor/common/config/editorConfigurationSchema.ts
index 684ec85c33b..5f18e0ce03f 100644
--- 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',
diff --git a/src/vs/editor/editor.all.ts b/src/vs/editor/editor.all.ts
index 71eedebd3b9..8cb672bb8dc 100644
--- 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';
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index c2eb25b69e9..7138127f621 100644
--- 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;
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index 8f8caf549a3..92cf32cf2d5 100644
--- 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,
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 168b46965be..2148581e50f 100644
--- 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
 	 */
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index adb0fcddd35..58377fcf767 100644
--- 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);
 	}
diff --git a/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts b/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
index f9f2bd13d28..d8c0d322bf3 100644
--- 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());
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
index 7ab77c57846..369eef0d3cf 100644
--- 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,
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
index 0dd0c906d17..bd56f8c7ff4 100644
--- 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 {
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
index 7148cccf5a3..62601268ebd 100644
--- 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;
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
index 7cff07828c4..af0bb4a20f4 100644
--- 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,
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index 589c0e5e99d..45c801dff07 100644
--- 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);
 	}
 

From ae33b4889e12a156e72b06afc17f635dc00986db Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 4 Sep 2023 18:37:18 +0200
Subject: [PATCH 78/94] Polishs arraysFind

---
 src/vs/base/common/arrays.ts                  | 116 +---------------
 src/vs/base/common/arraysFind.ts              | 129 +++++++++++++++---
 src/vs/base/test/common/arrays.test.ts        |  21 +--
 .../diffEditorWidget2/diffEditorWidget2.ts    |   2 +-
 .../diffEditorWidget2/movedBlocksLines.ts     |   3 +-
 .../editor/common/cursor/cursorCollection.ts  |   5 +-
 .../common/model/guidesTextModelPart.ts       |   2 +-
 .../editor/contrib/find/browser/findModel.ts  |   4 +-
 .../folding/browser/hiddenRangeModel.ts       |   4 +-
 .../browser/inlineCompletionsModel.ts         |   4 +-
 .../suggestWidgetInlineCompletionProvider.ts  |   5 +-
 .../browser/gotoSymbolQuickAccess.ts          |   2 +-
 src/vs/workbench/api/common/extHostTesting.ts |   6 +-
 .../comments/browser/commentsController.ts    |   5 +-
 .../contrib/debug/common/debugModel.ts        |   5 +-
 .../mergeEditor/browser/model/mapping.ts      |   3 +-
 .../mergeEditor/browser/view/viewModel.ts     |   2 +-
 .../browser/contrib/find/findModel.ts         |  10 +-
 .../browser/diff/notebookDiffEditor.ts        |   4 +-
 .../testing/browser/testingExplorerView.ts    |   4 +-
 .../testing/common/testResultService.ts       |   4 +-
 21 files changed, 164 insertions(+), 176 deletions(-)

diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index 4061404c8ee..697eb769143 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -6,6 +6,7 @@
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { CancellationError } from 'vs/base/common/errors';
 import { ISplice } from 'vs/base/common/sequence';
+import { findFirstIdxMonotonousOrArrLen } from './arraysFind';
 
 /**
  * Returns the last element of an array.
@@ -106,27 +107,6 @@ export function binarySearch2(length: number, compareToKey: (index: number) => n
 	return -(low + 1);
 }
 
-/**
- * Takes a sorted array and a function p. The array is sorted in such a way that all elements where p(x) is false
- * are located before all elements where p(x) is true.
- * @returns the least x for which p(x) is true or array.length if no element fullfills the given function.
- */
-export function findFirstInSorted<T>(array: ReadonlyArray<T>, p: (x: T) => boolean): number {
-	let low = 0, high = array.length;
-	if (high === 0) {
-		return 0; // no children
-	}
-	while (low < high) {
-		const mid = Math.floor((low + high) / 2);
-		if (p(array[mid])) {
-			high = mid;
-		} else {
-			low = mid + 1;
-		}
-	}
-	return low;
-}
-
 type Compare<T> = (a: T, b: T) => number;
 
 
@@ -345,7 +325,7 @@ function topStep<T>(array: ReadonlyArray<T>, compare: (a: T, b: T) => number, re
 		const element = array[i];
 		if (compare(element, result[n - 1]) < 0) {
 			result.pop();
-			const j = findFirstInSorted(result, e => compare(element, e) < 0);
+			const j = findFirstIdxMonotonousOrArrLen(result, e => compare(element, e) < 0);
 			result.splice(j, 0, element);
 		}
 	}
@@ -427,26 +407,6 @@ export function uniqueFilter<T, R>(keyFn: (t: T) => R): (t: T) => boolean {
 	};
 }
 
-export function findLast<T>(arr: readonly T[], predicate: (item: T) => boolean): T | undefined {
-	const idx = findLastIndex(arr, predicate);
-	if (idx === -1) {
-		return undefined;
-	}
-	return arr[idx];
-}
-
-export function findLastIndex<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean): number {
-	for (let i = array.length - 1; i >= 0; i--) {
-		const element = array[i];
-
-		if (fn(element)) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
 export function firstOrDefault<T, NotFound = T>(array: ReadonlyArray<T>, notFoundValue: NotFound): T | NotFound;
 export function firstOrDefault<T>(array: ReadonlyArray<T>): T | undefined;
 export function firstOrDefault<T, NotFound = T>(array: ReadonlyArray<T>, notFoundValue?: NotFound): T | NotFound | undefined {
@@ -622,20 +582,6 @@ export function getRandomElement<T>(arr: T[]): T | undefined {
 	return arr[Math.floor(Math.random() * arr.length)];
 }
 
-/**
- * Returns the first mapped value of the array which is not undefined.
- */
-export function mapFind<T, R>(array: Iterable<T>, mapFn: (value: T) => R | undefined): R | undefined {
-	for (const value of array) {
-		const mapped = mapFn(value);
-		if (mapped !== undefined) {
-			return mapped;
-		}
-	}
-
-	return undefined;
-}
-
 /**
  * Insert the new items in the array.
  * @param array The original array.
@@ -747,64 +693,6 @@ export function reverseOrder<TItem>(comparator: Comparator<TItem>): Comparator<T
 	return (a, b) => -comparator(a, b);
 }
 
-/**
- * Returns the first item that is equal to or greater than every other item.
-*/
-export function findMaxBy<T>(items: readonly T[], comparator: Comparator<T>): T | undefined {
-	if (items.length === 0) {
-		return undefined;
-	}
-
-	let max = items[0];
-	for (let i = 1; i < items.length; i++) {
-		const item = items[i];
-		if (comparator(item, max) > 0) {
-			max = item;
-		}
-	}
-	return max;
-}
-
-/**
- * Returns the last item that is equal to or greater than every other item.
-*/
-export function findLastMaxBy<T>(items: readonly T[], comparator: Comparator<T>): T | undefined {
-	if (items.length === 0) {
-		return undefined;
-	}
-
-	let max = items[0];
-	for (let i = 1; i < items.length; i++) {
-		const item = items[i];
-		if (comparator(item, max) >= 0) {
-			max = item;
-		}
-	}
-	return max;
-}
-
-/**
- * Returns the first item that is equal to or less than every other item.
-*/
-export function findMinBy<T>(items: readonly T[], comparator: Comparator<T>): T | undefined {
-	return findMaxBy(items, (a, b) => -comparator(a, b));
-}
-
-export function findMaxIdxBy<T>(items: readonly T[], comparator: Comparator<T>): number {
-	if (items.length === 0) {
-		return -1;
-	}
-
-	let maxIdx = 0;
-	for (let i = 1; i < items.length; i++) {
-		const item = items[i];
-		if (comparator(item, items[maxIdx]) > 0) {
-			maxIdx = i;
-		}
-	}
-	return maxIdx;
-}
-
 export class ArrayQueue<T> {
 	private firstIdx = 0;
 	private lastIdx = this.items.length - 1;
diff --git a/src/vs/base/common/arraysFind.ts b/src/vs/base/common/arraysFind.ts
index d40aba8ab67..8ef2d2ad936 100644
--- a/src/vs/base/common/arraysFind.ts
+++ b/src/vs/base/common/arraysFind.ts
@@ -3,15 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Comparator } from './arrays';
+
+export function findLast<T>(array: readonly T[], predicate: (item: T) => boolean): T | undefined {
+	const idx = findLastIdx(array, predicate);
+	if (idx === -1) {
+		return undefined;
+	}
+	return array[idx];
+}
+
+export function findLastIdx<T>(array: readonly T[], predicate: (item: T) => boolean): number {
+	for (let i = array.length - 1; i >= 0; i--) {
+		const element = array[i];
+
+		if (predicate(element)) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
 /**
  * Finds the last item where predicate is true using binary search.
  * `predicate` must be monotonous, i.e. `arr.map(predicate)` must be like `[true, ..., true, false, ..., false]`!
  *
  * @returns `undefined` if no item matches, otherwise the last item that matches the predicate.
  */
-export function findLastMonotonous<T>(arr: T[], predicate: (item: T) => boolean): T | undefined {
-	const idx = findLastIdxMonotonous(arr, predicate);
-	return idx === -1 ? undefined : arr[idx];
+export function findLastMonotonous<T>(array: readonly T[], predicate: (item: T) => boolean): T | undefined {
+	const idx = findLastIdxMonotonous(array, predicate);
+	return idx === -1 ? undefined : array[idx];
 }
 
 /**
@@ -20,12 +42,12 @@ export function findLastMonotonous<T>(arr: T[], predicate: (item: T) => boolean)
  *
  * @returns `startIdx - 1` if predicate is false for all items, otherwise the index of the last item that matches the predicate.
  */
-export function findLastIdxMonotonous<T>(arr: T[], predicate: (item: T) => boolean, startIdx = 0, endIdxEx = arr.length): number {
+export function findLastIdxMonotonous<T>(array: readonly T[], predicate: (item: T) => boolean, startIdx = 0, endIdxEx = array.length): number {
 	let i = startIdx;
 	let j = endIdxEx;
 	while (i < j) {
 		const k = Math.floor((i + j) / 2);
-		if (predicate(arr[k])) {
+		if (predicate(array[k])) {
 			i = k + 1;
 		} else {
 			j = k;
@@ -34,16 +56,15 @@ export function findLastIdxMonotonous<T>(arr: T[], predicate: (item: T) => boole
 	return i - 1;
 }
 
-
 /**
  * Finds the first item where predicate is true using binary search.
  * `predicate` must be monotonous, i.e. `arr.map(predicate)` must be like `[false, ..., false, true, ..., true]`!
  *
  * @returns `undefined` if no item matches, otherwise the first item that matches the predicate.
  */
-export function findFirstMonotonous<T>(arr: T[], predicate: (item: T) => boolean): T | undefined {
-	const idx = findFirstIdxMonotonousOrArrLen(arr, predicate);
-	return idx === arr.length ? undefined : arr[idx];
+export function findFirstMonotonous<T>(array: readonly T[], predicate: (item: T) => boolean): T | undefined {
+	const idx = findFirstIdxMonotonousOrArrLen(array, predicate);
+	return idx === array.length ? undefined : array[idx];
 }
 
 /**
@@ -52,12 +73,12 @@ export function findFirstMonotonous<T>(arr: T[], predicate: (item: T) => boolean
  *
  * @returns `endIdxEx` if predicate is false for all items, otherwise the index of the first item that matches the predicate.
  */
-export function findFirstIdxMonotonousOrArrLen<T>(arr: T[], predicate: (item: T) => boolean, startIdx = 0, endIdxEx = arr.length): number {
+export function findFirstIdxMonotonousOrArrLen<T>(array: readonly T[], predicate: (item: T) => boolean, startIdx = 0, endIdxEx = array.length): number {
 	let i = startIdx;
 	let j = endIdxEx;
 	while (i < j) {
 		const k = Math.floor((i + j) / 2);
-		if (predicate(arr[k])) {
+		if (predicate(array[k])) {
 			j = k;
 		} else {
 			i = k + 1;
@@ -66,9 +87,9 @@ export function findFirstIdxMonotonousOrArrLen<T>(arr: T[], predicate: (item: T)
 	return i;
 }
 
-export function findFirstIdxMonotonous<T>(arr: T[], predicate: (item: T) => boolean, startIdx = 0, endIdxEx = arr.length): number {
-	const idx = findFirstIdxMonotonousOrArrLen(arr, predicate, startIdx, endIdxEx);
-	return idx === arr.length ? -1 : idx;
+export function findFirstIdxMonotonous<T>(array: readonly T[], predicate: (item: T) => boolean, startIdx = 0, endIdxEx = array.length): number {
+	const idx = findFirstIdxMonotonousOrArrLen(array, predicate, startIdx, endIdxEx);
+	return idx === array.length ? -1 : idx;
 }
 
 /**
@@ -83,7 +104,7 @@ export class MonotonousArray<T> {
 	private _findLastMonotonousLastIdx = 0;
 	private _prevFindLastPredicate: ((item: T) => boolean) | undefined;
 
-	constructor(private readonly _items: T[]) {
+	constructor(private readonly _array: readonly T[]) {
 	}
 
 	/**
@@ -93,7 +114,7 @@ export class MonotonousArray<T> {
 	findLastMonotonous(predicate: (item: T) => boolean): T | undefined {
 		if (MonotonousArray.assertInvariants) {
 			if (this._prevFindLastPredicate) {
-				for (const item of this._items) {
+				for (const item of this._array) {
 					if (this._prevFindLastPredicate(item) && !predicate(item)) {
 						throw new Error('MonotonousArray: current predicate must be weaker than (or equal to) the previous predicate.');
 					}
@@ -102,8 +123,80 @@ export class MonotonousArray<T> {
 			this._prevFindLastPredicate = predicate;
 		}
 
-		const idx = findLastIdxMonotonous(this._items, predicate, this._findLastMonotonousLastIdx);
+		const idx = findLastIdxMonotonous(this._array, predicate, this._findLastMonotonousLastIdx);
 		this._findLastMonotonousLastIdx = idx + 1;
-		return idx === -1 ? undefined : this._items[idx];
+		return idx === -1 ? undefined : this._array[idx];
 	}
 }
+
+/**
+ * Returns the first item that is equal to or greater than every other item.
+*/
+export function findFirstMaxBy<T>(array: readonly T[], comparator: Comparator<T>): T | undefined {
+	if (array.length === 0) {
+		return undefined;
+	}
+
+	let max = array[0];
+	for (let i = 1; i < array.length; i++) {
+		const item = array[i];
+		if (comparator(item, max) > 0) {
+			max = item;
+		}
+	}
+	return max;
+}
+
+/**
+ * Returns the last item that is equal to or greater than every other item.
+*/
+export function findLastMaxBy<T>(array: readonly T[], comparator: Comparator<T>): T | undefined {
+	if (array.length === 0) {
+		return undefined;
+	}
+
+	let max = array[0];
+	for (let i = 1; i < array.length; i++) {
+		const item = array[i];
+		if (comparator(item, max) >= 0) {
+			max = item;
+		}
+	}
+	return max;
+}
+
+/**
+ * Returns the first item that is equal to or less than every other item.
+*/
+export function findFirstMinBy<T>(array: readonly T[], comparator: Comparator<T>): T | undefined {
+	return findFirstMaxBy(array, (a, b) => -comparator(a, b));
+}
+
+export function findMaxIdxBy<T>(array: readonly T[], comparator: Comparator<T>): number {
+	if (array.length === 0) {
+		return -1;
+	}
+
+	let maxIdx = 0;
+	for (let i = 1; i < array.length; i++) {
+		const item = array[i];
+		if (comparator(item, array[maxIdx]) > 0) {
+			maxIdx = i;
+		}
+	}
+	return maxIdx;
+}
+
+/**
+ * Returns the first mapped value of the array which is not undefined.
+ */
+export function mapFindFirst<T, R>(items: Iterable<T>, mapFn: (value: T) => R | undefined): R | undefined {
+	for (const value of items) {
+		const mapped = mapFn(value);
+		if (mapped !== undefined) {
+			return mapped;
+		}
+	}
+
+	return undefined;
+}
diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index d49357f051a..d4bd7850703 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
 import * as arrays from 'vs/base/common/arrays';
+import * as arraysFind from 'vs/base/common/arraysFind';
 
 suite('Arrays', () => {
 
@@ -22,25 +23,25 @@ suite('Arrays', () => {
 	test('findFirst', () => {
 		const array = [1, 4, 5, 7, 55, 59, 60, 61, 64, 69];
 
-		let idx = arrays.findFirstInSorted(array, e => e >= 0);
+		let idx = arraysFind.findFirstIdxMonotonousOrArrLen(array, e => e >= 0);
 		assert.strictEqual(array[idx], 1);
 
-		idx = arrays.findFirstInSorted(array, e => e > 1);
+		idx = arraysFind.findFirstIdxMonotonousOrArrLen(array, e => e > 1);
 		assert.strictEqual(array[idx], 4);
 
-		idx = arrays.findFirstInSorted(array, e => e >= 8);
+		idx = arraysFind.findFirstIdxMonotonousOrArrLen(array, e => e >= 8);
 		assert.strictEqual(array[idx], 55);
 
-		idx = arrays.findFirstInSorted(array, e => e >= 61);
+		idx = arraysFind.findFirstIdxMonotonousOrArrLen(array, e => e >= 61);
 		assert.strictEqual(array[idx], 61);
 
-		idx = arrays.findFirstInSorted(array, e => e >= 69);
+		idx = arraysFind.findFirstIdxMonotonousOrArrLen(array, e => e >= 69);
 		assert.strictEqual(array[idx], 69);
 
-		idx = arrays.findFirstInSorted(array, e => e >= 70);
+		idx = arraysFind.findFirstIdxMonotonousOrArrLen(array, e => e >= 70);
 		assert.strictEqual(idx, array.length);
 
-		idx = arrays.findFirstInSorted([], e => e >= 0);
+		idx = arraysFind.findFirstIdxMonotonousOrArrLen([], e => e >= 0);
 		assert.strictEqual(array[idx], 1);
 	});
 
@@ -372,7 +373,7 @@ suite('Arrays', () => {
 		const array = [{ v: 3 }, { v: 5 }, { v: 2 }, { v: 2 }, { v: 2 }, { v: 5 }];
 
 		assert.strictEqual(
-			array.indexOf(arrays.findMaxBy(array, arrays.compareBy(v => v.v, arrays.numberComparator))!),
+			array.indexOf(arraysFind.findFirstMaxBy(array, arrays.compareBy(v => v.v, arrays.numberComparator))!),
 			1
 		);
 	});
@@ -381,7 +382,7 @@ suite('Arrays', () => {
 		const array = [{ v: 3 }, { v: 5 }, { v: 2 }, { v: 2 }, { v: 2 }, { v: 5 }];
 
 		assert.strictEqual(
-			array.indexOf(arrays.findLastMaxBy(array, arrays.compareBy(v => v.v, arrays.numberComparator))!),
+			array.indexOf(arraysFind.findLastMaxBy(array, arrays.compareBy(v => v.v, arrays.numberComparator))!),
 			5
 		);
 	});
@@ -390,7 +391,7 @@ suite('Arrays', () => {
 		const array = [{ v: 3 }, { v: 5 }, { v: 2 }, { v: 2 }, { v: 2 }, { v: 5 }];
 
 		assert.strictEqual(
-			array.indexOf(arrays.findMinBy(array, arrays.compareBy(v => v.v, arrays.numberComparator))!),
+			array.indexOf(arraysFind.findFirstMinBy(array, arrays.compareBy(v => v.v, arrays.numberComparator))!),
 			2
 		);
 	});
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
index 264b8117601..0e169daeb7b 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import { $, h } from 'vs/base/browser/dom';
 import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
-import { findLast } from 'vs/base/common/arrays';
+import { findLast } from 'vs/base/common/arraysFind';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Event } from 'vs/base/common/event';
 import { toDisposable } from 'vs/base/common/lifecycle';
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts b/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts
index c8ed76eb54c..54e19c99653 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts
@@ -6,7 +6,8 @@
 import { h } from 'vs/base/browser/dom';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';
-import { booleanComparator, compareBy, findMaxIdxBy, numberComparator, tieBreakComparators } from 'vs/base/common/arrays';
+import { booleanComparator, compareBy, numberComparator, tieBreakComparators } from 'vs/base/common/arrays';
+import { findMaxIdxBy } from 'vs/base/common/arraysFind';
 import { Codicon } from 'vs/base/common/codicons';
 import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IObservable, autorun, autorunHandleChanges, autorunWithStore, constObservable, derived, derivedWithStore, observableFromEvent, observableSignalFromEvent, observableValue, recomputeInitiallyAndOnChange } from 'vs/base/common/observable';
diff --git a/src/vs/editor/common/cursor/cursorCollection.ts b/src/vs/editor/common/cursor/cursorCollection.ts
index c29f268a969..f2e8a8b4388 100644
--- a/src/vs/editor/common/cursor/cursorCollection.ts
+++ b/src/vs/editor/common/cursor/cursorCollection.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, findLastMaxBy, findMinBy } from 'vs/base/common/arrays';
+import { compareBy } from 'vs/base/common/arrays';
+import { findLastMaxBy, findFirstMinBy } from 'vs/base/common/arraysFind';
 import { CursorState, PartialCursorState } from 'vs/editor/common/cursorCommon';
 import { CursorContext } from 'vs/editor/common/cursor/cursorContext';
 import { Cursor } from 'vs/editor/common/cursor/oneCursor';
@@ -72,7 +73,7 @@ export class CursorCollection {
 	}
 
 	public getTopMostViewPosition(): Position {
-		return findMinBy(
+		return findFirstMinBy(
 			this.cursors,
 			compareBy(c => c.viewState.position, Position.compare)
 		)!.viewState.position;
diff --git a/src/vs/editor/common/model/guidesTextModelPart.ts b/src/vs/editor/common/model/guidesTextModelPart.ts
index d8e264475ac..7963063d044 100644
--- a/src/vs/editor/common/model/guidesTextModelPart.ts
+++ b/src/vs/editor/common/model/guidesTextModelPart.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findLast } from 'vs/base/common/arrays';
+import { findLast } from 'vs/base/common/arraysFind';
 import * as strings from 'vs/base/common/strings';
 import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
 import { IPosition, Position } from 'vs/editor/common/core/position';
diff --git a/src/vs/editor/contrib/find/browser/findModel.ts b/src/vs/editor/contrib/find/browser/findModel.ts
index 8cdb9cbd804..a4611d37daf 100644
--- a/src/vs/editor/contrib/find/browser/findModel.ts
+++ b/src/vs/editor/contrib/find/browser/findModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findFirstInSorted } from 'vs/base/common/arrays';
+import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
 import { RunOnceScheduler, TimeoutTimer } from 'vs/base/common/async';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { DisposableStore, dispose } from 'vs/base/common/lifecycle';
@@ -211,7 +211,7 @@ export class FindModelBoundToEditorModel {
 		if (currentMatchesPosition === 0 && findMatches.length > 0) {
 			// current selection is not on top of a match
 			// try to find its nearest result from the top of the document
-			const matchAfterSelection = findFirstInSorted(findMatches.map(match => match.range), range => Range.compareRangesUsingStarts(range, editorSelection) >= 0);
+			const matchAfterSelection = findFirstIdxMonotonousOrArrLen(findMatches.map(match => match.range), range => Range.compareRangesUsingStarts(range, editorSelection) >= 0);
 			currentMatchesPosition = matchAfterSelection > 0 ? matchAfterSelection - 1 + 1 /** match position is one based */ : currentMatchesPosition;
 		}
 
diff --git a/src/vs/editor/contrib/folding/browser/hiddenRangeModel.ts b/src/vs/editor/contrib/folding/browser/hiddenRangeModel.ts
index ea8ff076531..6d72da79026 100644
--- a/src/vs/editor/contrib/folding/browser/hiddenRangeModel.ts
+++ b/src/vs/editor/contrib/folding/browser/hiddenRangeModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findFirstInSorted } from 'vs/base/common/arrays';
+import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
 
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -141,7 +141,7 @@ function isInside(line: number, range: IRange) {
 	return line >= range.startLineNumber && line <= range.endLineNumber;
 }
 function findRange(ranges: IRange[], line: number): IRange | null {
-	const i = findFirstInSorted(ranges, r => line < r.startLineNumber) - 1;
+	const i = findFirstIdxMonotonousOrArrLen(ranges, r => line < r.startLineNumber) - 1;
 	if (i >= 0 && ranges[i].endLineNumber >= line) {
 		return ranges[i];
 	}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
index e3e387ea66d..60d791a715d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mapFind } from 'vs/base/common/arrays';
+import { mapFindFirst } from 'vs/base/common/arraysFind';
 import { BugIndicatingError, onUnexpectedExternalError } from 'vs/base/common/errors';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IObservable, IReader, ITransaction, autorun, derived, derivedHandleChanges, derivedOpts, recomputeInitiallyAndOnChange, observableSignal, observableValue, subtransaction, transaction } from 'vs/base/common/observable';
@@ -244,7 +244,7 @@ export class InlineCompletionsModel extends Disposable {
 			? suggestWidgetInlineCompletions.inlineCompletions
 			: [this.selectedInlineCompletion.read(reader)].filter(isDefined);
 
-		const augmentedCompletion = mapFind(candidateInlineCompletions, completion => {
+		const augmentedCompletion = mapFindFirst(candidateInlineCompletions, completion => {
 			let r = completion.toSingleTextEdit(reader);
 			r = r.removeCommonPrefix(model, Range.fromPositions(r.range.getStartPosition(), suggestCompletion.range.getEndPosition()));
 			return r.augments(suggestCompletion) ? { edit: r, completion } : undefined;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts b/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
index 24c90dbdb52..90d53b26c8f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
@@ -16,7 +16,8 @@ import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestCont
 import { IObservable, ITransaction, observableValue, transaction } from 'vs/base/common/observable';
 import { SingleTextEdit } from 'vs/editor/contrib/inlineCompletions/browser/singleTextEdit';
 import { ITextModel } from 'vs/editor/common/model';
-import { compareBy, findMaxBy, numberComparator } from 'vs/base/common/arrays';
+import { compareBy, numberComparator } from 'vs/base/common/arrays';
+import { findFirstMaxBy } from 'vs/base/common/arraysFind';
 
 export class SuggestWidgetAdaptor extends Disposable {
 	private isSuggestWidgetVisible: boolean = false;
@@ -80,7 +81,7 @@ export class SuggestWidgetAdaptor extends Disposable {
 						})
 						.filter(item => item && item.valid && item.prefixLength > 0);
 
-					const result = findMaxBy(
+					const result = findFirstMaxBy(
 						candidates,
 						compareBy(s => s!.prefixLength, numberComparator)
 					);
diff --git a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
index 77197c2f9d4..01092241b7a 100644
--- a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
@@ -21,7 +21,7 @@ import { localize } from 'vs/nls';
 import { IQuickInputButton, IQuickPick, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { Position } from 'vs/editor/common/core/position';
-import { findLast } from 'vs/base/common/arrays';
+import { findLast } from 'vs/base/common/arraysFind';
 
 export interface IGotoSymbolQuickPickItem extends IQuickPickItem {
 	kind: SymbolKind;
diff --git a/src/vs/workbench/api/common/extHostTesting.ts b/src/vs/workbench/api/common/extHostTesting.ts
index 94af4f6b06e..b8096372fae 100644
--- a/src/vs/workbench/api/common/extHostTesting.ts
+++ b/src/vs/workbench/api/common/extHostTesting.ts
@@ -5,7 +5,7 @@
 
 /* eslint-disable local/code-no-native-private */
 
-import { mapFind } from 'vs/base/common/arrays';
+import { mapFindFirst } from 'vs/base/common/arraysFind';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
@@ -229,7 +229,7 @@ export class ExtHostTesting implements ExtHostTestingShape {
 	 * @inheritdoc
 	 */
 	$provideFileCoverage(runId: string, taskId: string, token: CancellationToken): Promise<IFileCoverage[]> {
-		const coverage = mapFind(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
+		const coverage = mapFindFirst(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
 		return coverage?.provideFileCoverage(token) ?? Promise.resolve([]);
 	}
 
@@ -237,7 +237,7 @@ export class ExtHostTesting implements ExtHostTestingShape {
 	 * @inheritdoc
 	 */
 	$resolveFileCoverage(runId: string, taskId: string, fileIndex: number, token: CancellationToken): Promise<CoverageDetails[]> {
-		const coverage = mapFind(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
+		const coverage = mapFindFirst(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
 		return coverage?.resolveFileCoverage(fileIndex, token) ?? Promise.resolve([]);
 	}
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentsController.ts b/src/vs/workbench/contrib/comments/browser/commentsController.ts
index 339b10df9e7..9fac6af0a65 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsController.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsController.ts
@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Action, IAction } from 'vs/base/common/actions';
-import { coalesce, findFirstInSorted } from 'vs/base/common/arrays';
+import { coalesce } from 'vs/base/common/arrays';
+import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
 import { CancelablePromise, createCancelablePromise, Delayer } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
@@ -588,7 +589,7 @@ export class CommentController implements IEditorContribution {
 			return 0;
 		});
 
-		const idx = findFirstInSorted(sortedWidgets, widget => {
+		const idx = findFirstIdxMonotonousOrArrLen(sortedWidgets, widget => {
 			const lineValueOne = reverse ? after.lineNumber : (widget.commentThread.range?.startLineNumber ?? 0);
 			const lineValueTwo = reverse ? (widget.commentThread.range?.startLineNumber ?? 0) : after.lineNumber;
 			const columnValueOne = reverse ? after.column : (widget.commentThread.range?.startColumn ?? 0);
diff --git a/src/vs/workbench/contrib/debug/common/debugModel.ts b/src/vs/workbench/contrib/debug/common/debugModel.ts
index 50640fcf7e5..15030ce7822 100644
--- a/src/vs/workbench/contrib/debug/common/debugModel.ts
+++ b/src/vs/workbench/contrib/debug/common/debugModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct, findLastIndex } from 'vs/base/common/arrays';
+import { distinct } from 'vs/base/common/arrays';
 import { DeferredPromise, RunOnceScheduler } from 'vs/base/common/async';
 import { decodeBase64, encodeBase64, VSBuffer } from 'vs/base/common/buffer';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
@@ -27,6 +27,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { ILogService } from 'vs/platform/log/common/log';
 import { autorun } from 'vs/base/common/observable';
+import { findLastIdx } from 'vs/base/common/arraysFind';
 
 interface IDebugProtocolVariableWithContext extends DebugProtocol.Variable {
 	__vscodeVariableMenuContext?: string;
@@ -1253,7 +1254,7 @@ export class DebugModel extends Disposable implements IDebugModel {
 		let index = -1;
 		if (session.parentSession) {
 			// Make sure that child sessions are placed after the parent session
-			index = findLastIndex(this.sessions, s => s.parentSession === session.parentSession || s === session.parentSession);
+			index = findLastIdx(this.sessions, s => s.parentSession === session.parentSession || s === session.parentSession);
 		}
 		if (index >= 0) {
 			this.sessions.splice(index + 1, 0, session);
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.ts
index 1f1bb9258b6..3bdcb016fef 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { compareBy, findLast, lastOrDefault, numberComparator } from 'vs/base/common/arrays';
+import { compareBy, lastOrDefault, numberComparator } from 'vs/base/common/arrays';
+import { findLast } from 'vs/base/common/arraysFind';
 import { assertFn, checkAdjacentItems } from 'vs/base/common/assert';
 import { BugIndicatingError } from 'vs/base/common/errors';
 import { Position } from 'vs/editor/common/core/position';
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
index 36b94d8490b..ca8a00e6b56 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findLast } from 'vs/base/common/arrays';
+import { findLast } from 'vs/base/common/arraysFind';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { derived, derivedObservableWithWritableCache, IObservable, IReader, ITransaction, observableValue, transaction } from 'vs/base/common/observable';
 import { Range } from 'vs/editor/common/core/range';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts
index da74cbb1a76..1d316007d01 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts
@@ -12,7 +12,7 @@ import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contri
 import { CellKind, INotebookSearchOptions, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { findFirstInSorted } from 'vs/base/common/arrays';
+import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { NotebookFindFilters } from 'vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
@@ -341,7 +341,7 @@ export class FindModel extends Disposable {
 		}
 
 		const findFirstMatchAfterCellIndex = (cellIndex: number) => {
-			const matchAfterSelection = findFirstInSorted(findMatches.map(match => match.index), index => index >= cellIndex);
+			const matchAfterSelection = findFirstIdxMonotonousOrArrLen(findMatches.map(match => match.index), index => index >= cellIndex);
 			this._updateCurrentMatch(findMatches, this._matchesCountBeforeIndex(findMatches, matchAfterSelection));
 		};
 
@@ -403,7 +403,7 @@ export class FindModel extends Disposable {
 				return;
 			}
 
-			const matchAfterSelection = findFirstInSorted(findMatches, match => match.index >= oldCurrMatchCellIndex) % findMatches.length;
+			const matchAfterSelection = findFirstIdxMonotonousOrArrLen(findMatches, match => match.index >= oldCurrMatchCellIndex) % findMatches.length;
 			if (findMatches[matchAfterSelection].index > oldCurrMatchCellIndex) {
 				// there is no search result in curr cell anymore, find the nearest one (from top to bottom)
 				this._updateCurrentMatch(findMatches, this._matchesCountBeforeIndex(findMatches, matchAfterSelection));
@@ -419,7 +419,7 @@ export class FindModel extends Disposable {
 				if (currMatchRangeInEditor !== null) {
 					// we find a range for the previous current match, let's find the nearest one after it (can overlap)
 					const cellMatch = findMatches[matchAfterSelection];
-					const matchAfterOldSelection = findFirstInSorted(cellMatch.contentMatches, match => Range.compareRangesUsingStarts((match as FindMatch).range, currMatchRangeInEditor) >= 0);
+					const matchAfterOldSelection = findFirstIdxMonotonousOrArrLen(cellMatch.contentMatches, match => Range.compareRangesUsingStarts((match as FindMatch).range, currMatchRangeInEditor) >= 0);
 					this._updateCurrentMatch(findMatches, this._matchesCountBeforeIndex(findMatches, matchAfterSelection) + matchAfterOldSelection);
 				} else {
 					// no range found, let's fall back to finding the nearest match
@@ -429,7 +429,7 @@ export class FindModel extends Disposable {
 			}
 		} else {
 			// output now has the highlight
-			const matchAfterSelection = findFirstInSorted(findMatches.map(match => match.index), index => index >= oldCurrMatchCellIndex) % findMatches.length;
+			const matchAfterSelection = findFirstIdxMonotonousOrArrLen(findMatches.map(match => match.index), index => index >= oldCurrMatchCellIndex) % findMatches.length;
 			this._updateCurrentMatch(findMatches, this._matchesCountBeforeIndex(findMatches, matchAfterSelection));
 		}
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
index d374f6caf15..955cf94c74e 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
@@ -5,7 +5,7 @@
 
 import * as nls from 'vs/nls';
 import * as DOM from 'vs/base/browser/dom';
-import { findLastIndex } from 'vs/base/common/arrays';
+import { findLastIdx } from 'vs/base/common/arraysFind';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
@@ -825,7 +825,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			this._list.reveal(prevChangeIndex);
 		} else {
 			// go to the last one
-			const index = findLastIndex(this._diffElementViewModels, vm => vm.type !== 'unchanged');
+			const index = findLastIdx(this._diffElementViewModels, vm => vm.type !== 'unchanged');
 			if (index >= 0) {
 				this._list.setFocus([index]);
 				this._list.reveal(index);
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index 84e09da8c8f..b0ad29a3597 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -12,7 +12,7 @@ import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelega
 import { DefaultKeyboardNavigationDelegate, IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { ITreeContextMenuEvent, ITreeFilter, ITreeNode, ITreeRenderer, ITreeSorter, TreeFilterResult, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
 import { Action, ActionRunner, IAction, Separator } from 'vs/base/common/actions';
-import { mapFind } from 'vs/base/common/arrays';
+import { mapFindFirst } from 'vs/base/common/arraysFind';
 import { RunOnceScheduler, disposableTimeout } from 'vs/base/common/async';
 import { Color, RGBA } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -509,7 +509,7 @@ class ResultSummaryView extends Disposable {
 			rerun.style.display = 'none';
 		} else {
 			const last = results[0];
-			const dominantState = mapFind(statesInOrder, s => last.counts[s] > 0 ? s : undefined);
+			const dominantState = mapFindFirst(statesInOrder, s => last.counts[s] > 0 ? s : undefined);
 			status.className = ThemeIcon.asClassName(icons.testingStatesToIcons.get(dominantState ?? TestResultState.Unset)!);
 			counts = collectTestStateCounts(false, [last]);
 			duration.textContent = last instanceof LiveTestResult ? formatDuration(last.completedAt! - last.startedAt) : '';
diff --git a/src/vs/workbench/contrib/testing/common/testResultService.ts b/src/vs/workbench/contrib/testing/common/testResultService.ts
index ecd01614b4c..69c740dce7c 100644
--- a/src/vs/workbench/contrib/testing/common/testResultService.ts
+++ b/src/vs/workbench/contrib/testing/common/testResultService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { findFirstInSorted } from 'vs/base/common/arrays';
+import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
 import { once } from 'vs/base/common/functional';
@@ -168,7 +168,7 @@ export class TestResultService implements ITestResultService {
 		if (result.completedAt === undefined) {
 			this.results.unshift(result);
 		} else {
-			const index = findFirstInSorted(this.results, r => r.completedAt !== undefined && r.completedAt <= result.completedAt!);
+			const index = findFirstIdxMonotonousOrArrLen(this.results, r => r.completedAt !== undefined && r.completedAt <= result.completedAt!);
 			this.results.splice(index, 0, result);
 			this.persistScheduler.schedule();
 		}

From 5463b416d2c411d0df33668e25ea01fda2b45fca Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 5 Sep 2023 11:13:44 +0200
Subject: [PATCH 79/94] Move marker creation to MarkerDecorations

---
 .../services/markerDecorationsService.ts      | 164 +++++++++---------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/vs/editor/common/services/markerDecorationsService.ts b/src/vs/editor/common/services/markerDecorationsService.ts
index 080e870b8b7..935b479a7f8 100644
--- a/src/vs/editor/common/services/markerDecorationsService.ts
+++ b/src/vs/editor/common/services/markerDecorationsService.ts
@@ -34,7 +34,13 @@ class MarkerDecorations extends Disposable {
 		}));
 	}
 
-	public update(markers: IMarker[], newDecorations: IModelDeltaDecoration[]): boolean {
+	public update(markers: IMarker[]): boolean {
+		const newDecorations: IModelDeltaDecoration[] = markers.map((marker) => {
+			return {
+				range: this._createDecorationRange(this.model, marker),
+				options: this._createDecorationOption(marker)
+			};
+		});
 		const oldIds = [...this._markersData.keys()];
 		this._markersData.clear();
 		const ids = this.model.deltaDecorations(oldIds, newDecorations);
@@ -58,87 +64,6 @@ class MarkerDecorations extends Disposable {
 		});
 		return res;
 	}
-}
-
-export class MarkerDecorationsService extends Disposable implements IMarkerDecorationsService {
-
-	declare readonly _serviceBrand: undefined;
-
-	private readonly _onDidChangeMarker = this._register(new Emitter<ITextModel>());
-	readonly onDidChangeMarker: Event<ITextModel> = this._onDidChangeMarker.event;
-
-	private readonly _markerDecorations = new ResourceMap<MarkerDecorations>();
-
-	constructor(
-		@IModelService modelService: IModelService,
-		@IMarkerService private readonly _markerService: IMarkerService
-	) {
-		super();
-		modelService.getModels().forEach(model => this._onModelAdded(model));
-		this._register(modelService.onModelAdded(this._onModelAdded, this));
-		this._register(modelService.onModelRemoved(this._onModelRemoved, this));
-		this._register(this._markerService.onMarkerChanged(this._handleMarkerChange, this));
-	}
-
-	override dispose() {
-		super.dispose();
-		this._markerDecorations.forEach(value => value.dispose());
-		this._markerDecorations.clear();
-	}
-
-	getMarker(uri: URI, decoration: IModelDecoration): IMarker | null {
-		const markerDecorations = this._markerDecorations.get(uri);
-		return markerDecorations ? (markerDecorations.getMarker(decoration) || null) : null;
-	}
-
-	getLiveMarkers(uri: URI): [Range, IMarker][] {
-		const markerDecorations = this._markerDecorations.get(uri);
-		return markerDecorations ? markerDecorations.getMarkers() : [];
-	}
-
-	private _handleMarkerChange(changedResources: readonly URI[]): void {
-		changedResources.forEach((resource) => {
-			const markerDecorations = this._markerDecorations.get(resource);
-			if (markerDecorations) {
-				this._updateDecorations(markerDecorations);
-			}
-		});
-	}
-
-	private _onModelAdded(model: ITextModel): void {
-		const markerDecorations = new MarkerDecorations(model);
-		this._markerDecorations.set(model.uri, markerDecorations);
-		this._updateDecorations(markerDecorations);
-	}
-
-	private _onModelRemoved(model: ITextModel): void {
-		const markerDecorations = this._markerDecorations.get(model.uri);
-		if (markerDecorations) {
-			markerDecorations.dispose();
-			this._markerDecorations.delete(model.uri);
-		}
-
-		// clean up markers for internal, transient models
-		if (model.uri.scheme === Schemas.inMemory
-			|| model.uri.scheme === Schemas.internal
-			|| model.uri.scheme === Schemas.vscode) {
-			this._markerService?.read({ resource: model.uri }).map(marker => marker.owner).forEach(owner => this._markerService.remove(owner, [model.uri]));
-		}
-	}
-
-	private _updateDecorations(markerDecorations: MarkerDecorations): void {
-		// Limit to the first 500 errors/warnings
-		const markers = this._markerService.read({ resource: markerDecorations.model.uri, take: 500 });
-		const newModelDecorations: IModelDeltaDecoration[] = markers.map((marker) => {
-			return {
-				range: this._createDecorationRange(markerDecorations.model, marker),
-				options: this._createDecorationOption(marker)
-			};
-		});
-		if (markerDecorations.update(markers, newModelDecorations)) {
-			this._onDidChangeMarker.fire(markerDecorations.model);
-		}
-	}
 
 	private _createDecorationRange(model: ITextModel, rawMarker: IMarker): Range {
 
@@ -252,3 +177,78 @@ export class MarkerDecorationsService extends Disposable implements IMarkerDecor
 		return false;
 	}
 }
+
+export class MarkerDecorationsService extends Disposable implements IMarkerDecorationsService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _onDidChangeMarker = this._register(new Emitter<ITextModel>());
+	readonly onDidChangeMarker: Event<ITextModel> = this._onDidChangeMarker.event;
+
+	private readonly _markerDecorations = new ResourceMap<MarkerDecorations>();
+
+	constructor(
+		@IModelService modelService: IModelService,
+		@IMarkerService private readonly _markerService: IMarkerService
+	) {
+		super();
+		modelService.getModels().forEach(model => this._onModelAdded(model));
+		this._register(modelService.onModelAdded(this._onModelAdded, this));
+		this._register(modelService.onModelRemoved(this._onModelRemoved, this));
+		this._register(this._markerService.onMarkerChanged(this._handleMarkerChange, this));
+	}
+
+	override dispose() {
+		super.dispose();
+		this._markerDecorations.forEach(value => value.dispose());
+		this._markerDecorations.clear();
+	}
+
+	getMarker(uri: URI, decoration: IModelDecoration): IMarker | null {
+		const markerDecorations = this._markerDecorations.get(uri);
+		return markerDecorations ? (markerDecorations.getMarker(decoration) || null) : null;
+	}
+
+	getLiveMarkers(uri: URI): [Range, IMarker][] {
+		const markerDecorations = this._markerDecorations.get(uri);
+		return markerDecorations ? markerDecorations.getMarkers() : [];
+	}
+
+	private _handleMarkerChange(changedResources: readonly URI[]): void {
+		changedResources.forEach((resource) => {
+			const markerDecorations = this._markerDecorations.get(resource);
+			if (markerDecorations) {
+				this._updateDecorations(markerDecorations);
+			}
+		});
+	}
+
+	private _onModelAdded(model: ITextModel): void {
+		const markerDecorations = new MarkerDecorations(model);
+		this._markerDecorations.set(model.uri, markerDecorations);
+		this._updateDecorations(markerDecorations);
+	}
+
+	private _onModelRemoved(model: ITextModel): void {
+		const markerDecorations = this._markerDecorations.get(model.uri);
+		if (markerDecorations) {
+			markerDecorations.dispose();
+			this._markerDecorations.delete(model.uri);
+		}
+
+		// clean up markers for internal, transient models
+		if (model.uri.scheme === Schemas.inMemory
+			|| model.uri.scheme === Schemas.internal
+			|| model.uri.scheme === Schemas.vscode) {
+			this._markerService?.read({ resource: model.uri }).map(marker => marker.owner).forEach(owner => this._markerService.remove(owner, [model.uri]));
+		}
+	}
+
+	private _updateDecorations(markerDecorations: MarkerDecorations): void {
+		// Limit to the first 500 errors/warnings
+		const markers = this._markerService.read({ resource: markerDecorations.model.uri, take: 500 });
+		if (markerDecorations.update(markers)) {
+			this._onDidChangeMarker.fire(markerDecorations.model);
+		}
+	}
+}

From 8f4d4d4bad51c7af90975521ad44fb1c82f3d911 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 5 Sep 2023 11:47:13 +0200
Subject: [PATCH 80/94] workaround browser bug, fix browser test debugging

---
 src/vs/base/common/arrays.ts    | 6 +++++-
 test/unit/browser/renderer.html | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index 4061404c8ee..ad2f1b67137 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -667,7 +667,11 @@ export function insertInto<T>(array: T[], start: number, newItems: T[]): void {
  */
 export function splice<T>(array: T[], start: number, deleteCount: number, newItems: T[]): T[] {
 	const index = getActualStartIndex(array, start);
-	const result = array.splice(index, deleteCount);
+	let result = array.splice(index, deleteCount);
+	if (result === undefined) {
+		// see https://bugs.webkit.org/show_bug.cgi?id=261140
+		result = [];
+	}
 	insertInto(array, index, newItems);
 	return result;
 }
diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html
index 45786072900..fe62a749a68 100644
--- a/test/unit/browser/renderer.html
+++ b/test/unit/browser/renderer.html
@@ -156,7 +156,7 @@
 		if (Array.isArray(modules) && modules.length > 0) {
 			console.log('MANUALLY running tests', modules);
 
-			loadAndRun(modules, true).then(() => console.log('done'), err => console.log(err));
+			loadAndRun({modules}, true).then(() => console.log('done'), err => console.log(err));
 		}
 	</script>
 </body>

From ba3bc87570dd69a027df091b59e7dfa8e9e7f0bb Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 5 Sep 2023 11:53:37 +0200
Subject: [PATCH 81/94] unskip test

---
 src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
index 6b60b35aef6..9ae0e08b0f1 100644
--- a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
+++ b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
@@ -380,7 +380,7 @@ suite('IndexTreeModel', () => {
 		assert.deepStrictEqual(list[5].depth, 1);
 	}));
 
-	test.skip('smart diff consistency', () => {
+	test('smart diff consistency', () => {
 		const times = 500;
 		const minEdits = 1;
 		const maxEdits = 10;

From 9c04ba42a86d04141e6a5290eb9ab398f2e12658 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 5 Sep 2023 11:58:10 +0200
Subject: [PATCH 82/94] Fixes #159555: Only recreate decorations for changed
 markers

---
 src/vs/base/common/map.ts                     |  60 ++++++
 src/vs/base/test/common/map.test.ts           |  88 ++++++++-
 .../services/markerDecorationsService.ts      | 187 ++++++++++--------
 3 files changed, 247 insertions(+), 88 deletions(-)

diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts
index e8dc62329e3..6f85a3111e3 100644
--- a/src/vs/base/common/map.ts
+++ b/src/vs/base/common/map.ts
@@ -664,3 +664,63 @@ export class CounterSet<T> {
 		return this.map.has(value);
 	}
 }
+
+/**
+ * A map that allows access both by keys and values.
+ * **NOTE**: values need to be unique.
+ */
+export class BidirectionalMap<K, V> {
+
+	private readonly _m1 = new Map<K, V>();
+	private readonly _m2 = new Map<V, K>();
+
+	constructor(entries?: readonly (readonly [K, V])[]) {
+		if (entries) {
+			for (const [key, value] of entries) {
+				this.set(key, value);
+			}
+		}
+	}
+
+	clear(): void {
+		this._m1.clear();
+		this._m2.clear();
+	}
+
+	set(key: K, value: V): void {
+		this._m1.set(key, value);
+		this._m2.set(value, key);
+	}
+
+	get(key: K): V | undefined {
+		return this._m1.get(key);
+	}
+
+	getKey(value: V): K | undefined {
+		return this._m2.get(value);
+	}
+
+	delete(key: K): boolean {
+		const value = this._m1.get(key);
+		if (value === undefined) {
+			return false;
+		}
+		this._m1.delete(key);
+		this._m2.delete(value);
+		return true;
+	}
+
+	forEach(callbackfn: (value: V, key: K, map: BidirectionalMap<K, V>) => void, thisArg?: any): void {
+		this._m1.forEach((value, key) => {
+			callbackfn.call(thisArg, value, key, this);
+		});
+	}
+
+	keys(): IterableIterator<K> {
+		return this._m1.keys();
+	}
+
+	values(): IterableIterator<V> {
+		return this._m1.values();
+	}
+}
diff --git a/src/vs/base/test/common/map.test.ts b/src/vs/base/test/common/map.test.ts
index 85234d90197..e8cfca7d714 100644
--- a/src/vs/base/test/common/map.test.ts
+++ b/src/vs/base/test/common/map.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { LinkedMap, LRUCache, ResourceMap, Touch } from 'vs/base/common/map';
+import { BidirectionalMap, LinkedMap, LRUCache, ResourceMap, Touch } from 'vs/base/common/map';
 import { extUriIgnorePathCase } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 
@@ -485,3 +485,89 @@ suite('Map', () => {
 	});
 });
 
+suite('BidirectionalMap', () => {
+	test('should set and get values correctly', () => {
+		const map = new BidirectionalMap<string, number>();
+		map.set('one', 1);
+		map.set('two', 2);
+		map.set('three', 3);
+
+		assert.strictEqual(map.get('one'), 1);
+		assert.strictEqual(map.get('two'), 2);
+		assert.strictEqual(map.get('three'), 3);
+	});
+
+	test('should get keys by value correctly', () => {
+		const map = new BidirectionalMap<string, number>();
+		map.set('one', 1);
+		map.set('two', 2);
+		map.set('three', 3);
+
+		assert.strictEqual(map.getKey(1), 'one');
+		assert.strictEqual(map.getKey(2), 'two');
+		assert.strictEqual(map.getKey(3), 'three');
+	});
+
+	test('should delete values correctly', () => {
+		const map = new BidirectionalMap<string, number>();
+		map.set('one', 1);
+		map.set('two', 2);
+		map.set('three', 3);
+
+		assert.strictEqual(map.delete('one'), true);
+		assert.strictEqual(map.get('one'), undefined);
+		assert.strictEqual(map.getKey(1), undefined);
+
+		assert.strictEqual(map.delete('two'), true);
+		assert.strictEqual(map.get('two'), undefined);
+		assert.strictEqual(map.getKey(2), undefined);
+
+		assert.strictEqual(map.delete('three'), true);
+		assert.strictEqual(map.get('three'), undefined);
+		assert.strictEqual(map.getKey(3), undefined);
+	});
+
+	test('should handle non-existent keys correctly', () => {
+		const map = new BidirectionalMap<string, number>();
+		map.set('one', 1);
+		map.set('two', 2);
+		map.set('three', 3);
+
+		assert.strictEqual(map.get('four'), undefined);
+		assert.strictEqual(map.getKey(4), undefined);
+		assert.strictEqual(map.delete('four'), false);
+	});
+
+	test('should handle forEach correctly', () => {
+		const map = new BidirectionalMap<string, number>();
+		map.set('one', 1);
+		map.set('two', 2);
+		map.set('three', 3);
+
+		const keys: string[] = [];
+		const values: number[] = [];
+		map.forEach((value, key) => {
+			keys.push(key);
+			values.push(value);
+		});
+
+		assert.deepStrictEqual(keys, ['one', 'two', 'three']);
+		assert.deepStrictEqual(values, [1, 2, 3]);
+	});
+
+	test('should handle clear correctly', () => {
+		const map = new BidirectionalMap<string, number>();
+		map.set('one', 1);
+		map.set('two', 2);
+		map.set('three', 3);
+
+		map.clear();
+
+		assert.strictEqual(map.get('one'), undefined);
+		assert.strictEqual(map.get('two'), undefined);
+		assert.strictEqual(map.get('three'), undefined);
+		assert.strictEqual(map.getKey(1), undefined);
+		assert.strictEqual(map.getKey(2), undefined);
+		assert.strictEqual(map.getKey(3), undefined);
+	});
+});
diff --git a/src/vs/editor/common/services/markerDecorationsService.ts b/src/vs/editor/common/services/markerDecorationsService.ts
index 935b479a7f8..c6397b71e0a 100644
--- a/src/vs/editor/common/services/markerDecorationsService.ts
+++ b/src/vs/editor/common/services/markerDecorationsService.ts
@@ -17,46 +17,134 @@ import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecor
 import { Schemas } from 'vs/base/common/network';
 import { Emitter, Event } from 'vs/base/common/event';
 import { minimapWarning, minimapError } from 'vs/platform/theme/common/colorRegistry';
-import { ResourceMap } from 'vs/base/common/map';
+import { BidirectionalMap, ResourceMap } from 'vs/base/common/map';
+import { diffSets } from 'vs/base/common/collections';
 
+export class MarkerDecorationsService extends Disposable implements IMarkerDecorationsService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _onDidChangeMarker = this._register(new Emitter<ITextModel>());
+	readonly onDidChangeMarker: Event<ITextModel> = this._onDidChangeMarker.event;
+
+	private readonly _markerDecorations = new ResourceMap<MarkerDecorations>();
+
+	constructor(
+		@IModelService modelService: IModelService,
+		@IMarkerService private readonly _markerService: IMarkerService
+	) {
+		super();
+		modelService.getModels().forEach(model => this._onModelAdded(model));
+		this._register(modelService.onModelAdded(this._onModelAdded, this));
+		this._register(modelService.onModelRemoved(this._onModelRemoved, this));
+		this._register(this._markerService.onMarkerChanged(this._handleMarkerChange, this));
+	}
+
+	override dispose() {
+		super.dispose();
+		this._markerDecorations.forEach(value => value.dispose());
+		this._markerDecorations.clear();
+	}
+
+	getMarker(uri: URI, decoration: IModelDecoration): IMarker | null {
+		const markerDecorations = this._markerDecorations.get(uri);
+		return markerDecorations ? (markerDecorations.getMarker(decoration) || null) : null;
+	}
+
+	getLiveMarkers(uri: URI): [Range, IMarker][] {
+		const markerDecorations = this._markerDecorations.get(uri);
+		return markerDecorations ? markerDecorations.getMarkers() : [];
+	}
+
+	private _handleMarkerChange(changedResources: readonly URI[]): void {
+		changedResources.forEach((resource) => {
+			const markerDecorations = this._markerDecorations.get(resource);
+			if (markerDecorations) {
+				this._updateDecorations(markerDecorations);
+			}
+		});
+	}
+
+	private _onModelAdded(model: ITextModel): void {
+		const markerDecorations = new MarkerDecorations(model);
+		this._markerDecorations.set(model.uri, markerDecorations);
+		this._updateDecorations(markerDecorations);
+	}
+
+	private _onModelRemoved(model: ITextModel): void {
+		const markerDecorations = this._markerDecorations.get(model.uri);
+		if (markerDecorations) {
+			markerDecorations.dispose();
+			this._markerDecorations.delete(model.uri);
+		}
+
+		// clean up markers for internal, transient models
+		if (model.uri.scheme === Schemas.inMemory
+			|| model.uri.scheme === Schemas.internal
+			|| model.uri.scheme === Schemas.vscode) {
+			this._markerService?.read({ resource: model.uri }).map(marker => marker.owner).forEach(owner => this._markerService.remove(owner, [model.uri]));
+		}
+	}
+
+	private _updateDecorations(markerDecorations: MarkerDecorations): void {
+		// Limit to the first 500 errors/warnings
+		const markers = this._markerService.read({ resource: markerDecorations.model.uri, take: 500 });
+		if (markerDecorations.update(markers)) {
+			this._onDidChangeMarker.fire(markerDecorations.model);
+		}
+	}
+}
 
 class MarkerDecorations extends Disposable {
 
-	private readonly _markersData: Map<string, IMarker> = new Map<string, IMarker>();
+	private readonly _map = new BidirectionalMap<IMarker, /*decoration id*/string>();
 
 	constructor(
 		readonly model: ITextModel
 	) {
 		super();
 		this._register(toDisposable(() => {
-			this.model.deltaDecorations([...this._markersData.keys()], []);
-			this._markersData.clear();
+			this.model.deltaDecorations([...this._map.values()], []);
+			this._map.clear();
 		}));
 	}
 
 	public update(markers: IMarker[]): boolean {
-		const newDecorations: IModelDeltaDecoration[] = markers.map((marker) => {
+
+		// We use the fact that marker instances are not recreated when different owners
+		// update. So we can compare references to find out what changed since the last update.
+
+		const { added, removed } = diffSets(new Set(this._map.keys()), new Set(markers));
+
+		if (added.length === 0 && removed.length === 0) {
+			return false;
+		}
+
+		const oldIds: string[] = removed.map(marker => this._map.get(marker)!);
+		const newDecorations: IModelDeltaDecoration[] = added.map(marker => {
 			return {
 				range: this._createDecorationRange(this.model, marker),
 				options: this._createDecorationOption(marker)
 			};
 		});
-		const oldIds = [...this._markersData.keys()];
-		this._markersData.clear();
+
 		const ids = this.model.deltaDecorations(oldIds, newDecorations);
-		for (let index = 0; index < ids.length; index++) {
-			this._markersData.set(ids[index], markers[index]);
+		for (const removedMarker of removed) {
+			this._map.delete(removedMarker);
 		}
-		return oldIds.length !== 0 || ids.length !== 0;
+		for (let index = 0; index < ids.length; index++) {
+			this._map.set(added[index], ids[index]);
+		}
+		return true;
 	}
 
 	getMarker(decoration: IModelDecoration): IMarker | undefined {
-		return this._markersData.get(decoration.id);
+		return this._map.getKey(decoration.id);
 	}
 
 	getMarkers(): [Range, IMarker][] {
 		const res: [Range, IMarker][] = [];
-		this._markersData.forEach((marker, id) => {
+		this._map.forEach((id, marker) => {
 			const range = this.model.getDecorationRange(id);
 			if (range) {
 				res.push([range, marker]);
@@ -177,78 +265,3 @@ class MarkerDecorations extends Disposable {
 		return false;
 	}
 }
-
-export class MarkerDecorationsService extends Disposable implements IMarkerDecorationsService {
-
-	declare readonly _serviceBrand: undefined;
-
-	private readonly _onDidChangeMarker = this._register(new Emitter<ITextModel>());
-	readonly onDidChangeMarker: Event<ITextModel> = this._onDidChangeMarker.event;
-
-	private readonly _markerDecorations = new ResourceMap<MarkerDecorations>();
-
-	constructor(
-		@IModelService modelService: IModelService,
-		@IMarkerService private readonly _markerService: IMarkerService
-	) {
-		super();
-		modelService.getModels().forEach(model => this._onModelAdded(model));
-		this._register(modelService.onModelAdded(this._onModelAdded, this));
-		this._register(modelService.onModelRemoved(this._onModelRemoved, this));
-		this._register(this._markerService.onMarkerChanged(this._handleMarkerChange, this));
-	}
-
-	override dispose() {
-		super.dispose();
-		this._markerDecorations.forEach(value => value.dispose());
-		this._markerDecorations.clear();
-	}
-
-	getMarker(uri: URI, decoration: IModelDecoration): IMarker | null {
-		const markerDecorations = this._markerDecorations.get(uri);
-		return markerDecorations ? (markerDecorations.getMarker(decoration) || null) : null;
-	}
-
-	getLiveMarkers(uri: URI): [Range, IMarker][] {
-		const markerDecorations = this._markerDecorations.get(uri);
-		return markerDecorations ? markerDecorations.getMarkers() : [];
-	}
-
-	private _handleMarkerChange(changedResources: readonly URI[]): void {
-		changedResources.forEach((resource) => {
-			const markerDecorations = this._markerDecorations.get(resource);
-			if (markerDecorations) {
-				this._updateDecorations(markerDecorations);
-			}
-		});
-	}
-
-	private _onModelAdded(model: ITextModel): void {
-		const markerDecorations = new MarkerDecorations(model);
-		this._markerDecorations.set(model.uri, markerDecorations);
-		this._updateDecorations(markerDecorations);
-	}
-
-	private _onModelRemoved(model: ITextModel): void {
-		const markerDecorations = this._markerDecorations.get(model.uri);
-		if (markerDecorations) {
-			markerDecorations.dispose();
-			this._markerDecorations.delete(model.uri);
-		}
-
-		// clean up markers for internal, transient models
-		if (model.uri.scheme === Schemas.inMemory
-			|| model.uri.scheme === Schemas.internal
-			|| model.uri.scheme === Schemas.vscode) {
-			this._markerService?.read({ resource: model.uri }).map(marker => marker.owner).forEach(owner => this._markerService.remove(owner, [model.uri]));
-		}
-	}
-
-	private _updateDecorations(markerDecorations: MarkerDecorations): void {
-		// Limit to the first 500 errors/warnings
-		const markers = this._markerService.read({ resource: markerDecorations.model.uri, take: 500 });
-		if (markerDecorations.update(markers)) {
-			this._onDidChangeMarker.fire(markerDecorations.model);
-		}
-	}
-}

From a3d328a65c06f693ab4c8b9bcd469eaac1c3c522 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 5 Sep 2023 07:19:43 -0700
Subject: [PATCH 83/94] testing: fix most disposable leaks in testing, tree
 (#192026)

This fixes disposable leaks in the testing tests. These tests also
encompass tree views. One big source of leaks I found was `Event.chain`:
technically, every step in the chain is an IDisposable and needs to be
disposed. However, this is very noisy and unergonomic.

As an alternative, I introduce a very small `chain2` implementation
which only requires disposing the resulting event listener, like an
ordinary emitter. It doesn't support debouncing, though it could we if
want it to; there was only a single usable of the chained `debounce`
method in our codebase.

For #190503
---
 src/vs/base/browser/ui/list/listView.ts       |   4 +-
 src/vs/base/browser/ui/list/listWidget.ts     | 120 ++++++++++--------
 src/vs/base/browser/ui/tree/abstractTree.ts   |  36 +++---
 src/vs/base/common/event.ts                   | 104 ++++++++++++++-
 src/vs/base/test/common/event.test.ts         |  78 ++++++++++++
 .../contrib/testing/common/observableValue.ts |   3 +-
 .../testing/common/testExplorerFilterState.ts |  15 ++-
 .../testing/common/testProfileService.ts      |  11 +-
 .../contrib/testing/common/testResult.ts      |  14 +-
 .../testing/common/testResultService.ts       |   6 +-
 .../testing/common/testResultStorage.ts       |   8 +-
 .../hierarchalByLocation.test.ts              |  18 ++-
 .../testing/test/browser/testObjectTree.ts    |   2 +-
 .../common/testExplorerFilterState.test.ts    |  14 +-
 .../test/common/testProfileService.test.ts    |  17 ++-
 .../test/common/testResultService.test.ts     |  36 ++++--
 .../test/common/testResultStorage.test.ts     |  16 ++-
 .../testing/test/common/testingUri.test.ts    |   3 +
 18 files changed, 382 insertions(+), 123 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index b73e5811121..769778f62f7 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -403,11 +403,11 @@ export class ListView<T> implements IListView<T> {
 
 		this.disposables.add(Gesture.addTarget(this.rowsContainer));
 
-		this.scrollable = new Scrollable({
+		this.scrollable = this.disposables.add(new Scrollable({
 			forceIntegerValues: true,
 			smoothScrollDuration: (options.smoothScrolling ?? false) ? 125 : 0,
 			scheduleAtNextAnimationFrame: cb => scheduleAtNextAnimationFrame(cb)
-		});
+		}));
 		this.scrollableElement = this.disposables.add(new SmoothScrollableElement(this.rowsContainer, {
 			alwaysConsumeMouseWheel: options.alwaysConsumeMouseWheel ?? DefaultOptions.alwaysConsumeMouseWheel,
 			horizontal: ScrollbarVisibility.Auto,
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index 262d3ca9e2e..070cc08eeb4 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -293,12 +293,15 @@ class KeyboardController<T> implements IDisposable {
 
 	private readonly disposables = new DisposableStore();
 	private readonly multipleSelectionDisposables = new DisposableStore();
+	private multipleSelectionSupport: boolean | undefined;
 
 	@memoize
-	private get onKeyDown(): Event.IChainableEvent<StandardKeyboardEvent> {
-		return this.disposables.add(Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event)
-			.filter(e => !isInputElement(e.target as HTMLElement))
-			.map(e => new StandardKeyboardEvent(e)));
+	private get onKeyDown(): Event<StandardKeyboardEvent> {
+		return Event.chain2(
+			this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
+			$.filter(e => !isInputElement(e.target as HTMLElement))
+				.map(e => new StandardKeyboardEvent(e))
+		);
 	}
 
 	constructor(
@@ -306,25 +309,32 @@ class KeyboardController<T> implements IDisposable {
 		private view: IListView<T>,
 		options: IListOptions<T>
 	) {
-		this.onKeyDown.filter(e => e.keyCode === KeyCode.Enter).on(this.onEnter, this, this.disposables);
-		this.onKeyDown.filter(e => e.keyCode === KeyCode.UpArrow).on(this.onUpArrow, this, this.disposables);
-		this.onKeyDown.filter(e => e.keyCode === KeyCode.DownArrow).on(this.onDownArrow, this, this.disposables);
-		this.onKeyDown.filter(e => e.keyCode === KeyCode.PageUp).on(this.onPageUpArrow, this, this.disposables);
-		this.onKeyDown.filter(e => e.keyCode === KeyCode.PageDown).on(this.onPageDownArrow, this, this.disposables);
-		this.onKeyDown.filter(e => e.keyCode === KeyCode.Escape).on(this.onEscape, this, this.disposables);
-
-		if (options.multipleSelectionSupport !== false) {
-			this.onKeyDown.filter(e => (platform.isMacintosh ? e.metaKey : e.ctrlKey) && e.keyCode === KeyCode.KeyA).on(this.onCtrlA, this, this.multipleSelectionDisposables);
-		}
+		this.multipleSelectionSupport = options.multipleSelectionSupport;
+		this.disposables.add(this.onKeyDown(e => {
+			switch (e.keyCode) {
+				case KeyCode.Enter:
+					return this.onEnter(e);
+				case KeyCode.UpArrow:
+					return this.onUpArrow(e);
+				case KeyCode.DownArrow:
+					return this.onDownArrow(e);
+				case KeyCode.PageUp:
+					return this.onPageUpArrow(e);
+				case KeyCode.PageDown:
+					return this.onPageDownArrow(e);
+				case KeyCode.Escape:
+					return this.onEscape(e);
+				case KeyCode.KeyA:
+					if (this.multipleSelectionSupport && (platform.isMacintosh ? e.metaKey : e.ctrlKey)) {
+						this.onCtrlA(e);
+					}
+			}
+		}));
 	}
 
 	updateOptions(optionsUpdate: IListOptionsUpdate): void {
 		if (optionsUpdate.multipleSelectionSupport !== undefined) {
-			this.multipleSelectionDisposables.clear();
-
-			if (optionsUpdate.multipleSelectionSupport) {
-				this.onKeyDown.filter(e => (platform.isMacintosh ? e.metaKey : e.ctrlKey) && e.keyCode === KeyCode.KeyA).on(this.onCtrlA, this, this.multipleSelectionDisposables);
-			}
+			this.multipleSelectionSupport = optionsUpdate.multipleSelectionSupport;
 		}
 	}
 
@@ -464,15 +474,15 @@ class TypeNavigationController<T> implements IDisposable {
 
 		let typing = false;
 
-		const onChar = this.enabledDisposables.add(Event.chain(this.enabledDisposables.add(new DomEmitter(this.view.domNode, 'keydown')).event))
-			.filter(e => !isInputElement(e.target as HTMLElement))
-			.filter(() => this.mode === TypeNavigationMode.Automatic || this.triggered)
-			.map(event => new StandardKeyboardEvent(event))
-			.filter(e => typing || this.keyboardNavigationEventFilter(e))
-			.filter(e => this.delegate.mightProducePrintableCharacter(e))
-			.forEach(e => EventHelper.stop(e, true))
-			.map(event => event.browserEvent.key)
-			.event;
+		const onChar = Event.chain2(this.enabledDisposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
+			$.filter(e => !isInputElement(e.target as HTMLElement))
+				.filter(() => this.mode === TypeNavigationMode.Automatic || this.triggered)
+				.map(event => new StandardKeyboardEvent(event))
+				.filter(e => typing || this.keyboardNavigationEventFilter(e))
+				.filter(e => this.delegate.mightProducePrintableCharacter(e))
+				.forEach(e => EventHelper.stop(e, true))
+				.map(event => event.browserEvent.key)
+		);
 
 		const onClear = Event.debounce<string, null>(onChar, () => null, 800, undefined, undefined, undefined, this.enabledDisposables);
 		const onInput = Event.reduce<string | null, string | null>(Event.any(onChar, onClear), (r, i) => i === null ? null : ((r || '') + i), undefined, this.enabledDisposables);
@@ -570,12 +580,14 @@ class DOMFocusController<T> implements IDisposable {
 		private list: List<T>,
 		private view: IListView<T>
 	) {
-		const onKeyDown = this.disposables.add(Event.chain(this.disposables.add(new DomEmitter(view.domNode, 'keydown')).event))
+		const onKeyDown = Event.chain2(this.disposables.add(new DomEmitter(view.domNode, 'keydown')).event, $ => $
 			.filter(e => !isInputElement(e.target as HTMLElement))
-			.map(e => new StandardKeyboardEvent(e));
+			.map(e => new StandardKeyboardEvent(e))
+		);
 
-		onKeyDown.filter(e => e.keyCode === KeyCode.Tab && !e.ctrlKey && !e.metaKey && !e.shiftKey && !e.altKey)
-			.on(this.onTab, this, this.disposables);
+		const onTab = Event.chain2(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Tab && !e.ctrlKey && !e.metaKey && !e.shiftKey && !e.altKey));
+
+		onTab(this.onTab, this, this.disposables);
 	}
 
 	private onTab(e: StandardKeyboardEvent): void {
@@ -1348,31 +1360,29 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 	@memoize get onContextMenu(): Event<IListContextMenuEvent<T>> {
 		let didJustPressContextMenuKey = false;
 
-		const fromKeyDown = this.disposables.add(Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event))
-			.map(e => new StandardKeyboardEvent(e))
-			.filter(e => didJustPressContextMenuKey = e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10))
-			.map(e => EventHelper.stop(e, true))
-			.filter(() => false)
-			.event as Event<any>;
+		const fromKeyDown: Event<any> = Event.chain2(this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
+			$.map(e => new StandardKeyboardEvent(e))
+				.filter(e => didJustPressContextMenuKey = e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10))
+				.map(e => EventHelper.stop(e, true))
+				.filter(() => false));
 
-		const fromKeyUp = this.disposables.add(Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keyup')).event))
-			.forEach(() => didJustPressContextMenuKey = false)
-			.map(e => new StandardKeyboardEvent(e))
-			.filter(e => e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10))
-			.map(e => EventHelper.stop(e, true))
-			.map(({ browserEvent }) => {
-				const focus = this.getFocus();
-				const index = focus.length ? focus[0] : undefined;
-				const element = typeof index !== 'undefined' ? this.view.element(index) : undefined;
-				const anchor = typeof index !== 'undefined' ? this.view.domElement(index) as HTMLElement : this.view.domNode;
-				return { index, element, anchor, browserEvent };
-			})
-			.event;
+		const fromKeyUp = Event.chain2(this.disposables.add(new DomEmitter(this.view.domNode, 'keyup')).event, $ =>
+			$.forEach(() => didJustPressContextMenuKey = false)
+				.map(e => new StandardKeyboardEvent(e))
+				.filter(e => e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10))
+				.map(e => EventHelper.stop(e, true))
+				.map(({ browserEvent }) => {
+					const focus = this.getFocus();
+					const index = focus.length ? focus[0] : undefined;
+					const element = typeof index !== 'undefined' ? this.view.element(index) : undefined;
+					const anchor = typeof index !== 'undefined' ? this.view.domElement(index) as HTMLElement : this.view.domNode;
+					return { index, element, anchor, browserEvent };
+				}));
 
-		const fromMouse = this.disposables.add(Event.chain(this.view.onContextMenu))
-			.filter(_ => !didJustPressContextMenuKey)
-			.map(({ element, index, browserEvent }) => ({ element, index, anchor: new StandardMouseEvent(browserEvent), browserEvent }))
-			.event;
+		const fromMouse = Event.chain2(this.view.onContextMenu, $ =>
+			$.filter(_ => !didJustPressContextMenuKey)
+				.map(({ element, index, browserEvent }) => ({ element, index, anchor: new StandardMouseEvent(browserEvent), browserEvent }))
+		);
 
 		return Event.any<IListContextMenuEvent<T>>(fromKeyDown, fromKeyUp, fromMouse);
 	}
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index 70199a8164c..4327f53551f 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -19,7 +19,7 @@ import { getVisibleState, isFilterResult } from 'vs/base/browser/ui/tree/indexTr
 import { ICollapseStateChangeEvent, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeEvent, ITreeFilter, ITreeModel, ITreeModelSpliceEvent, ITreeMouseEvent, ITreeNavigator, ITreeNode, ITreeRenderer, TreeDragOverBubble, TreeError, TreeFilterResult, TreeMouseEventTarget, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
 import { Action } from 'vs/base/common/actions';
 import { distinct, equals, firstOrDefault, range } from 'vs/base/common/arrays';
-import { disposableTimeout, timeout } from 'vs/base/common/async';
+import { Delayer, disposableTimeout, timeout } from 'vs/base/common/async';
 import { Codicon } from 'vs/base/common/codicons';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { SetMap } from 'vs/base/common/collections';
@@ -814,9 +814,7 @@ class FindWidget<T, TFilterData> extends Disposable {
 		this.mode = mode;
 
 		const emitter = this._register(new DomEmitter(this.findInput.inputBox.inputElement, 'keydown'));
-		const onKeyDown = this._register(Event.chain(emitter.event))
-			.map(e => new StandardKeyboardEvent(e))
-			.event;
+		const onKeyDown = Event.chain2(emitter.event, $ => $.map(e => new StandardKeyboardEvent(e)));
 
 		this._register(onKeyDown((e): any => {
 			// Using equals() so we reserve modified keys for future use
@@ -886,9 +884,7 @@ class FindWidget<T, TFilterData> extends Disposable {
 			}));
 		}));
 
-		const onGrabKeyDown = this._register(Event.chain(this._register(new DomEmitter(this.elements.grab, 'keydown')).event))
-			.map(e => new StandardKeyboardEvent(e))
-			.event;
+		const onGrabKeyDown = Event.chain2(this._register(new DomEmitter(this.elements.grab, 'keydown')).event, $ => $.map(e => new StandardKeyboardEvent(e)));
 
 		this._register(onGrabKeyDown((e): any => {
 			let right: number | undefined;
@@ -1624,9 +1620,10 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		// We debounce it with 0 delay since these events may fire in the same stack and we only
 		// want to run this once. It also doesn't matter if it runs on the next tick since it's only
 		// a nice to have UI feature.
-		onDidChangeActiveNodes.input = Event.chain(Event.any<any>(onDidModelSplice, this.focus.onDidChange, this.selection.onDidChange))
-			.debounce(() => null, 0)
-			.map(() => {
+		const activeNodesEmitter = this.disposables.add(new Emitter<ITreeNode<T, TFilterData>[]>());
+		const activeNodesDebounce = this.disposables.add(new Delayer(0));
+		this.disposables.add(Event.any<any>(onDidModelSplice, this.focus.onDidChange, this.selection.onDidChange)(() => {
+			activeNodesDebounce.trigger(() => {
 				const set = new Set<ITreeNode<T, TFilterData>>();
 
 				for (const node of this.focus.getNodes()) {
@@ -1637,17 +1634,20 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 					set.add(node);
 				}
 
-				return [...set.values()];
-			}).event;
+				activeNodesEmitter.fire([...set.values()]);
+			});
+		}));
+		onDidChangeActiveNodes.input = activeNodesEmitter.event;
 
 		if (_options.keyboardSupport !== false) {
-			const onKeyDown = Event.chain(this.view.onKeyDown)
-				.filter(e => !isInputElement(e.target as HTMLElement))
-				.map(e => new StandardKeyboardEvent(e));
+			const onKeyDown = Event.chain2(this.view.onKeyDown, $ =>
+				$.filter(e => !isInputElement(e.target as HTMLElement))
+					.map(e => new StandardKeyboardEvent(e))
+			);
 
-			onKeyDown.filter(e => e.keyCode === KeyCode.LeftArrow).on(this.onLeftArrow, this, this.disposables);
-			onKeyDown.filter(e => e.keyCode === KeyCode.RightArrow).on(this.onRightArrow, this, this.disposables);
-			onKeyDown.filter(e => e.keyCode === KeyCode.Space).on(this.onSpace, this, this.disposables);
+			Event.chain2(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.LeftArrow))(this.onLeftArrow, this, this.disposables);
+			Event.chain2(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.RightArrow))(this.onRightArrow, this, this.disposables);
+			Event.chain2(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Space))(this.onSpace, this, this.disposables);
 		}
 
 		if ((_options.findWidgetEnabled ?? true) && _options.keyboardNavigationLabelProvider && _options.contextViewProvider) {
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index c26c0271f39..7f3b4406d7a 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -165,7 +165,10 @@ export namespace Event {
 	export function any<T>(...events: Event<T>[]): Event<T>;
 	export function any(...events: Event<any>[]): Event<void>;
 	export function any<T>(...events: Event<T>[]): Event<T> {
-		return (listener, thisArgs = null, disposables?) => combinedDisposable(...events.map(event => event(e => listener.call(thisArgs, e), null, disposables)));
+		return (listener, thisArgs = null, disposables?) => {
+			const disposable = combinedDisposable(...events.map(event => event(e => listener.call(thisArgs, e))));
+			return addAndReturnDisposable(disposable, disposables);
+		};
 	}
 
 	/**
@@ -205,6 +208,19 @@ export namespace Event {
 		return emitter.event;
 	}
 
+	/**
+	 * Adds the IDisposable to the store if it's set, and returns it. Useful to
+	 * Event function implementation.
+	 */
+	function addAndReturnDisposable<T extends IDisposable>(d: T, store: DisposableStore | IDisposable[] | undefined): T {
+		if (store instanceof Array) {
+			store.push(d);
+		} else if (store) {
+			store.add(d);
+		}
+		return d;
+	}
+
 	/**
 	 * Given an event, creates a new emitter that event that will debounce events based on {@link delay} and give an
 	 * array event object of all events that fired.
@@ -422,6 +438,92 @@ export namespace Event {
 		return emitter.event;
 	}
 
+	/**
+	 * Implements event chaining, in a way that avoids having disposable
+	 * intermediates at each step like {@link chain} does.
+	 */
+	export function chain2<T, R>(event: Event<T>, sythensize: ($: IChainableSythensis<T>) => IChainableSythensis<R>): Event<R> {
+		const fn: Event<R> = (listener, thisArgs, disposables) => {
+			const cs = new ChainableSynthesis();
+			sythensize(cs);
+			return event(value => {
+				const result = cs.evaluate(value);
+				if (result !== HaltChainable) {
+					listener(result);
+				}
+			}, thisArgs, disposables);
+		};
+
+		return fn;
+	}
+
+	const HaltChainable = Symbol('HaltChainable');
+
+	class ChainableSynthesis implements IChainableSythensis<any> {
+		private readonly steps: ((input: any) => any)[] = [];
+
+		map<O>(fn: (i: any) => O): this {
+			this.steps.push(fn);
+			return this;
+		}
+
+		forEach(fn: (i: any) => void): this {
+			this.steps.push(v => {
+				fn(v);
+				return v;
+			});
+			return this;
+		}
+
+		filter(fn: (e: any) => boolean): this {
+			this.steps.push(v => fn(v) ? v : HaltChainable);
+			return this;
+		}
+
+		reduce<R>(merge: (last: R | undefined, event: any) => R, initial?: R | undefined): this {
+			let last = initial;
+			this.steps.push(v => {
+				last = merge(last, v);
+				return last;
+			});
+			return this;
+		}
+
+		latch(equals: (a: any, b: any) => boolean = (a, b) => a === b): ChainableSynthesis {
+			let firstCall = true;
+			let cache: any;
+			this.steps.push(value => {
+				const shouldEmit = firstCall || !equals(value, cache);
+				firstCall = false;
+				cache = value;
+				return shouldEmit ? value : HaltChainable;
+			});
+
+			return this;
+		}
+
+		public evaluate(value: any) {
+			for (const step of this.steps) {
+				value = step(value);
+				if (value === HaltChainable) {
+					break;
+				}
+			}
+
+			return value;
+		}
+	}
+
+	export interface IChainableSythensis<T> {
+		map<O>(fn: (i: T) => O): IChainableSythensis<O>;
+		forEach(fn: (i: T) => void): IChainableSythensis<T>;
+		filter(fn: (e: T) => boolean): IChainableSythensis<T>;
+		filter<R>(fn: (e: T | R) => e is R): IChainableSythensis<R>;
+		reduce<R>(merge: (last: R, event: T) => R, initial: R): IChainableSythensis<R>;
+		reduce<R>(merge: (last: R | undefined, event: T) => R): IChainableSythensis<R>;
+		latch(equals?: (a: T, b: T) => boolean): IChainableSythensis<T>;
+	}
+
 	export interface IChainableEvent<T> extends IDisposable {
 
 		event: Event<T>;
diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts
index 30320370f2a..c2ef872140e 100644
--- a/src/vs/base/test/common/event.test.ts
+++ b/src/vs/base/test/common/event.test.ts
@@ -1507,4 +1507,82 @@ suite('Event utils', () => {
 			assert.deepStrictEqual(calls, [1]);
 		});
 	});
+
+	suite('chain2', () => {
+		let store: DisposableStore;
+		let em: Emitter<number>;
+		let calls: number[];
+
+		teardown(() => {
+			store.dispose();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		setup(() => {
+			store = new DisposableStore();
+			em = new Emitter<number>();
+			store.add(em);
+			calls = [];
+		});
+
+		test('maps', () => {
+			const ev = Event.chain2(em.event, $ => $.map(v => v * 2));
+			store.add(ev(v => calls.push(v)));
+			em.fire(1);
+			em.fire(2);
+			em.fire(3);
+			assert.deepStrictEqual(calls, [2, 4, 6]);
+		});
+
+		test('filters', () => {
+			const ev = Event.chain2(em.event, $ => $.filter(v => v % 2 === 0));
+			store.add(ev(v => calls.push(v)));
+			em.fire(1);
+			em.fire(2);
+			em.fire(3);
+			em.fire(4);
+			assert.deepStrictEqual(calls, [2, 4]);
+		});
+
+		test('reduces', () => {
+			const ev = Event.chain2(em.event, $ => $.reduce((acc, v) => acc + v, 0));
+			store.add(ev(v => calls.push(v)));
+			em.fire(1);
+			em.fire(2);
+			em.fire(3);
+			em.fire(4);
+			assert.deepStrictEqual(calls, [1, 3, 6, 10]);
+		});
+
+		test('latches', () => {
+			const ev = Event.chain2(em.event, $ => $.latch());
+			store.add(ev(v => calls.push(v)));
+			em.fire(1);
+			em.fire(1);
+			em.fire(2);
+			em.fire(2);
+			em.fire(3);
+			em.fire(3);
+			em.fire(1);
+			assert.deepStrictEqual(calls, [1, 2, 3, 1]);
+		});
+
+		test('does everything', () => {
+			const ev = Event.chain2(em.event, $ => $
+				.filter(v => v % 2 === 0)
+				.map(v => v * 2)
+				.reduce((acc, v) => acc + v, 0)
+				.latch()
+			);
+
+			store.add(ev(v => calls.push(v)));
+			em.fire(1);
+			em.fire(2);
+			em.fire(3);
+			em.fire(4);
+			em.fire(0);
+			assert.deepStrictEqual(calls, [4, 12]);
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/testing/common/observableValue.ts b/src/vs/workbench/contrib/testing/common/observableValue.ts
index bc14ca7fb0f..942a75307e5 100644
--- a/src/vs/workbench/contrib/testing/common/observableValue.ts
+++ b/src/vs/workbench/contrib/testing/common/observableValue.ts
@@ -35,7 +35,8 @@ export class MutableObservableValue<T> extends Disposable implements IObservable
 
 	public static stored<T>(stored: StoredValue<T>, defaultValue: T) {
 		const o = new MutableObservableValue(stored.get(defaultValue));
-		o.onDidChange(value => stored.store(value));
+		o._register(stored);
+		o._register(o.onDidChange(value => stored.store(value)));
 		return o;
 	}
 
diff --git a/src/vs/workbench/contrib/testing/common/testExplorerFilterState.ts b/src/vs/workbench/contrib/testing/common/testExplorerFilterState.ts
index e4f27947199..a92eb4ae7a4 100644
--- a/src/vs/workbench/contrib/testing/common/testExplorerFilterState.ts
+++ b/src/vs/workbench/contrib/testing/common/testExplorerFilterState.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import { Emitter, Event } from 'vs/base/common/event';
 import { splitGlobAware } from 'vs/base/common/glob';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { IObservableValue, MutableObservableValue } from 'vs/workbench/contrib/testing/common/observableValue';
@@ -68,7 +69,7 @@ export const ITestExplorerFilterState = createDecorator<ITestExplorerFilterState
 const tagRe = /!?@([^ ,:]+)/g;
 const trimExtraWhitespace = (str: string) => str.replace(/\s\s+/g, ' ').trim();
 
-export class TestExplorerFilterState implements ITestExplorerFilterState {
+export class TestExplorerFilterState extends Disposable implements ITestExplorerFilterState {
 	declare _serviceBrand: undefined;
 	private readonly focusEmitter = new Emitter<void>();
 	/**
@@ -86,20 +87,22 @@ export class TestExplorerFilterState implements ITestExplorerFilterState {
 	public excludeTags = new Set<string>();
 
 	/** @inheritdoc */
-	public readonly text = new MutableObservableValue('');
+	public readonly text = this._register(new MutableObservableValue(''));
 
 	/** @inheritdoc */
-	public readonly fuzzy = MutableObservableValue.stored(new StoredValue<boolean>({
+	public readonly fuzzy = this._register(MutableObservableValue.stored(new StoredValue<boolean>({
 		key: 'testHistoryFuzzy',
 		scope: StorageScope.PROFILE,
 		target: StorageTarget.USER,
-	}, this.storageService), false);
+	}, this.storageService), false));
 
-	public readonly reveal = new MutableObservableValue</* test ID */string | undefined>(undefined);
+	public readonly reveal = this._register(new MutableObservableValue</* test ID */string | undefined>(undefined));
 
 	public readonly onDidRequestInputFocus = this.focusEmitter.event;
 
-	constructor(@IStorageService private readonly storageService: IStorageService) { }
+	constructor(@IStorageService private readonly storageService: IStorageService) {
+		super();
+	}
 
 	/** @inheritdoc */
 	public focusInput() {
diff --git a/src/vs/workbench/contrib/testing/common/testProfileService.ts b/src/vs/workbench/contrib/testing/common/testProfileService.ts
index 03541ed9053..4c0d99bdf8c 100644
--- a/src/vs/workbench/contrib/testing/common/testProfileService.ts
+++ b/src/vs/workbench/contrib/testing/common/testProfileService.ts
@@ -13,6 +13,7 @@ import { InternalTestItem, ITestRunProfile, TestRunProfileBitset, testRunProfile
 import { TestId } from 'vs/workbench/contrib/testing/common/testId';
 import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
 import { IMainThreadTestController } from 'vs/workbench/contrib/testing/common/testService';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export const ITestProfileService = createDecorator<ITestProfileService>('testProfileService');
 
@@ -100,11 +101,11 @@ export const capabilityContextKeys = (capabilities: number): [key: string, value
 	[TestingContextKeys.hasCoverableTests.key, (capabilities & TestRunProfileBitset.Coverage) !== 0],
 ];
 
-export class TestProfileService implements ITestProfileService {
+export class TestProfileService extends Disposable implements ITestProfileService {
 	declare readonly _serviceBrand: undefined;
 	private readonly preferredDefaults: StoredValue<{ [K in TestRunProfileBitset]?: { controllerId: string; profileId: number }[] }>;
 	private readonly capabilitiesContexts: { [K in TestRunProfileBitset]: IContextKey<boolean> };
-	private readonly changeEmitter = new Emitter<void>();
+	private readonly changeEmitter = this._register(new Emitter<void>());
 	private readonly controllerProfiles = new Map</* controller ID */string, {
 		profiles: ITestRunProfile[];
 		controller: IMainThreadTestController;
@@ -117,11 +118,13 @@ export class TestProfileService implements ITestProfileService {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IStorageService storageService: IStorageService,
 	) {
-		this.preferredDefaults = new StoredValue({
+		super();
+
+		this.preferredDefaults = this._register(new StoredValue({
 			key: 'testingPreferredProfiles',
 			scope: StorageScope.WORKSPACE,
 			target: StorageTarget.MACHINE,
-		}, storageService);
+		}, storageService));
 
 		this.capabilitiesContexts = {
 			[TestRunProfileBitset.Run]: TestingContextKeys.hasRunnableTests.bindTo(contextKeyService),
diff --git a/src/vs/workbench/contrib/testing/common/testResult.ts b/src/vs/workbench/contrib/testing/common/testResult.ts
index f289a268bfa..56497f3827a 100644
--- a/src/vs/workbench/contrib/testing/common/testResult.ts
+++ b/src/vs/workbench/contrib/testing/common/testResult.ts
@@ -7,6 +7,7 @@ import { DeferredPromise } from 'vs/base/common/async';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Lazy } from 'vs/base/common/lazy';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { language } from 'vs/base/common/platform';
 import { WellDefinedPrefixTree } from 'vs/base/common/prefixTree';
 import { removeAnsiEscapeCodes } from 'vs/base/common/strings';
@@ -274,11 +275,11 @@ export type TestResultItemChange = { item: TestResultItem; result: ITestResult }
  * Results of a test. These are created when the test initially started running
  * and marked as "complete" when the run finishes.
  */
-export class LiveTestResult implements ITestResult {
-	private readonly completeEmitter = new Emitter<void>();
-	private readonly newTaskEmitter = new Emitter<number>();
-	private readonly endTaskEmitter = new Emitter<number>();
-	private readonly changeEmitter = new Emitter<TestResultItemChange>();
+export class LiveTestResult extends Disposable implements ITestResult {
+	private readonly completeEmitter = this._register(new Emitter<void>());
+	private readonly newTaskEmitter = this._register(new Emitter<number>());
+	private readonly endTaskEmitter = this._register(new Emitter<number>());
+	private readonly changeEmitter = this._register(new Emitter<TestResultItemChange>());
 	/** todo@connor4312: convert to a WellDefinedPrefixTree */
 	private readonly testById = new Map<string, TestResultItemWithChildren>();
 	private testMarkerCounter = 0;
@@ -334,6 +335,7 @@ export class LiveTestResult implements ITestResult {
 		public readonly persist: boolean,
 		public readonly request: ResolvedTestRunRequest,
 	) {
+		super();
 	}
 
 	/**
@@ -382,7 +384,7 @@ export class LiveTestResult implements ITestResult {
 	 * Adds a new run task to the results.
 	 */
 	public addTask(task: ITestRunTask) {
-		this.tasks.push({ ...task, coverage: new MutableObservableValue(undefined), otherMessages: [], output: new TaskRawOutput() });
+		this.tasks.push({ ...task, coverage: this._register(new MutableObservableValue(undefined)), otherMessages: [], output: new TaskRawOutput() });
 
 		for (const test of this.tests) {
 			test.tasks.push({ duration: undefined, messages: [], state: TestResultState.Unset });
diff --git a/src/vs/workbench/contrib/testing/common/testResultService.ts b/src/vs/workbench/contrib/testing/common/testResultService.ts
index 69c740dce7c..e931cef40ac 100644
--- a/src/vs/workbench/contrib/testing/common/testResultService.ts
+++ b/src/vs/workbench/contrib/testing/common/testResultService.ts
@@ -7,6 +7,7 @@ import { findFirstIdxMonotonousOrArrLen } from 'vs/base/common/arraysFind';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
 import { once } from 'vs/base/common/functional';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { generateUuid } from 'vs/base/common/uuid';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -179,8 +180,9 @@ export class TestResultService implements ITestResultService {
 		}
 
 		if (result instanceof LiveTestResult) {
-			result.onComplete(() => this.onComplete(result));
-			result.onChange(this.testChangeEmitter.fire, this.testChangeEmitter);
+			const ds = new DisposableStore();
+			ds.add(result.onComplete(() => this.onComplete(result)));
+			ds.add(result.onChange(this.testChangeEmitter.fire, this.testChangeEmitter));
 			this.isRunning.set(true);
 			this.changeResultEmitter.fire({ started: result });
 		} else {
diff --git a/src/vs/workbench/contrib/testing/common/testResultStorage.ts b/src/vs/workbench/contrib/testing/common/testResultStorage.ts
index 2b2e027b65b..5574e744b8a 100644
--- a/src/vs/workbench/contrib/testing/common/testResultStorage.ts
+++ b/src/vs/workbench/contrib/testing/common/testResultStorage.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { bufferToStream, newWriteableBufferStream, VSBuffer, VSBufferReadableStream, VSBufferWriteableStream } from 'vs/base/common/buffer';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { isDefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -44,19 +45,20 @@ export const ITestResultStorage = createDecorator('ITestResultStorage');
  */
 const currentRevision = 1;
 
-export abstract class BaseTestResultStorage implements ITestResultStorage {
+export abstract class BaseTestResultStorage extends Disposable implements ITestResultStorage {
 	declare readonly _serviceBrand: undefined;
 
-	protected readonly stored = new StoredValue<ReadonlyArray<{ rev: number; id: string; bytes: number }>>({
+	protected readonly stored = this._register(new StoredValue<ReadonlyArray<{ rev: number; id: string; bytes: number }>>({
 		key: 'storedTestResults',
 		scope: StorageScope.WORKSPACE,
 		target: StorageTarget.MACHINE
-	}, this.storageService);
+	}, this.storageService));
 
 	constructor(
 		@IStorageService private readonly storageService: IStorageService,
 		@ILogService private readonly logService: ILogService,
 	) {
+		super();
 	}
 
 	/**
diff --git a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByLocation.test.ts b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByLocation.test.ts
index 574835878e2..97b6ef85520 100644
--- a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByLocation.test.ts
+++ b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByLocation.test.ts
@@ -5,6 +5,8 @@
 
 import * as assert from 'assert';
 import { Emitter } from 'vs/base/common/event';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { TreeProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/treeProjection';
 import { TestId } from 'vs/workbench/contrib/testing/common/testId';
 import { TestResultItemChange, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult';
@@ -19,9 +21,17 @@ suite('Workbench - Testing Explorer Hierarchal by Location Projection', () => {
 	let harness: TestTreeTestHarness<TestHierarchicalByLocationProjection>;
 	let onTestChanged: Emitter<TestResultItemChange>;
 	let resultsService: any;
+	let ds: DisposableStore;
+
+	teardown(() => {
+		ds.dispose();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 
 	setup(() => {
-		onTestChanged = new Emitter();
+		ds = new DisposableStore();
+		onTestChanged = ds.add(new Emitter());
 		resultsService = {
 			results: [],
 			onResultsChanged: () => undefined,
@@ -29,11 +39,7 @@ suite('Workbench - Testing Explorer Hierarchal by Location Projection', () => {
 			getStateById: () => ({ state: { state: 0 }, computedState: 0 }),
 		};
 
-		harness = new TestTreeTestHarness(l => new TestHierarchicalByLocationProjection({}, l, resultsService as any));
-	});
-
-	teardown(() => {
-		harness.dispose();
+		harness = ds.add(new TestTreeTestHarness(l => new TestHierarchicalByLocationProjection({}, l, resultsService as any)));
 	});
 
 	test('renders initial tree', async () => {
diff --git a/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts b/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
index c1792e29343..1e447daa7d5 100644
--- a/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
+++ b/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
@@ -104,7 +104,7 @@ export class TestTreeTestHarness<T extends ITestTreeProjection = ITestTreeProjec
 	constructor(makeTree: (listener: ITestService) => T, public readonly c = testStubs.nested()) {
 		super();
 		this._register(c);
-		this.c.onDidGenerateDiff(d => this.c.setDiff(d /* don't clear during testing */));
+		this._register(this.c.onDidGenerateDiff(d => this.c.setDiff(d /* don't clear during testing */)));
 
 		const collection = new MainThreadTestCollection((testId, levels) => {
 			this.c.expand(testId, levels);
diff --git a/src/vs/workbench/contrib/testing/test/common/testExplorerFilterState.test.ts b/src/vs/workbench/contrib/testing/test/common/testExplorerFilterState.test.ts
index cc89323ebdd..2be30fb7d2a 100644
--- a/src/vs/workbench/contrib/testing/test/common/testExplorerFilterState.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testExplorerFilterState.test.ts
@@ -4,14 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { InMemoryStorageService } from 'vs/platform/storage/common/storage';
 import { TestExplorerFilterState, TestFilterTerm } from 'vs/workbench/contrib/testing/common/testExplorerFilterState';
 
-
 suite('TestExplorerFilterState', () => {
 	let t: TestExplorerFilterState;
+	let ds: DisposableStore;
+
+	teardown(() => {
+		ds.dispose();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	setup(() => {
-		t = new TestExplorerFilterState(new InMemoryStorageService());
+		ds = new DisposableStore();
+		t = ds.add(new TestExplorerFilterState(ds.add(new InMemoryStorageService())));
 	});
 
 	const assertFilteringFor = (expected: { [T in TestFilterTerm]?: boolean }) => {
diff --git a/src/vs/workbench/contrib/testing/test/common/testProfileService.test.ts b/src/vs/workbench/contrib/testing/test/common/testProfileService.test.ts
index 129ce196195..bbb315cfa2f 100644
--- a/src/vs/workbench/contrib/testing/test/common/testProfileService.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testProfileService.test.ts
@@ -6,6 +6,8 @@
 
 
 import * as assert from 'assert';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { TestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
 import { ITestRunProfile, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
@@ -13,13 +15,22 @@ import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServic
 
 suite('Workbench - TestProfileService', () => {
 	let t: TestProfileService;
+	let ds: DisposableStore;
 	let idCounter = 0;
+
+	teardown(() => {
+		ds.dispose();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	setup(() => {
 		idCounter = 0;
-		t = new TestProfileService(
+		ds = new DisposableStore();
+		t = ds.add(new TestProfileService(
 			new MockContextKeyService(),
-			new TestStorageService(),
-		);
+			ds.add(new TestStorageService()),
+		));
 	});
 
 	const addProfile = (profile: Partial<ITestRunProfile>) => {
diff --git a/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts b/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
index 4f19df8e1a4..464cceb9478 100644
--- a/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
@@ -6,16 +6,17 @@
 import * as assert from 'assert';
 import { timeout } from 'vs/base/common/async';
 import { VSBuffer } from 'vs/base/common/buffer';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { TestId } from 'vs/workbench/contrib/testing/common/testId';
 import { TestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
-import { HydratedTestResult, LiveTestResult, resultItemParents, TaskRawOutput, TestResultItemChange, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult';
+import { HydratedTestResult, LiveTestResult, TaskRawOutput, TestResultItemChange, TestResultItemChangeReason, resultItemParents } from 'vs/workbench/contrib/testing/common/testResult';
 import { TestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
-import { InMemoryResultStorage, ITestResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage';
+import { ITestResultStorage, InMemoryResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage';
 import { ITestTaskState, ResolvedTestRunRequest, TestResultItem, TestResultState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
 import { makeEmptyCounts } from 'vs/workbench/contrib/testing/common/testingStates';
-import { getInitializedMainTestCollection, testStubs, TestTestCollection } from 'vs/workbench/contrib/testing/test/common/testStubs';
+import { TestTestCollection, getInitializedMainTestCollection, testStubs } from 'vs/workbench/contrib/testing/test/common/testStubs';
 import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
 
 suite('Workbench - Test Results Service', () => {
@@ -26,6 +27,7 @@ suite('Workbench - Test Results Service', () => {
 	let r: TestLiveTestResult;
 	let changed = new Set<TestResultItemChange>();
 	let tests: TestTestCollection;
+	let ds: DisposableStore;
 
 	const defaultOpts = (testIds: string[]): ResolvedTestRunRequest => ({
 		targets: [{
@@ -37,23 +39,33 @@ suite('Workbench - Test Results Service', () => {
 	});
 
 	class TestLiveTestResult extends LiveTestResult {
+		constructor(
+			id: string,
+			persist: boolean,
+			request: ResolvedTestRunRequest,
+		) {
+			super(id, persist, request);
+			ds.add(this);
+		}
+
 		public setAllToStatePublic(state: TestResultState, taskId: string, when: (task: ITestTaskState, item: TestResultItem) => boolean) {
 			this.setAllToState(state, taskId, when);
 		}
 	}
 
 	setup(async () => {
+		ds = new DisposableStore();
 		changed = new Set();
-		r = new TestLiveTestResult(
+		r = ds.add(new TestLiveTestResult(
 			'foo',
 			true,
 			defaultOpts(['id-a']),
-		);
+		));
 
 		r.onChange(e => changed.add(e));
 		r.addTask({ id: 't', name: undefined, running: true });
 
-		tests = testStubs.nested();
+		tests = ds.add(testStubs.nested());
 		const ok = await Promise.race([
 			Promise.resolve(tests.expand(tests.root.id, Infinity)).then(() => true),
 			timeout(1000).then(() => false),
@@ -76,6 +88,12 @@ suite('Workbench - Test Results Service', () => {
 		]);
 	});
 
+	teardown(() => {
+		ds.dispose();
+	});
+
+	// ensureNoDisposablesAreLeakedInTestSuite(); todo@connor4312
+
 	suite('LiveTestResult', () => {
 		test('is empty if no tests are yet present', async () => {
 			assert.deepStrictEqual(getLabelsIn(new TestLiveTestResult(
@@ -190,8 +208,8 @@ suite('Workbench - Test Results Service', () => {
 		}
 
 		setup(() => {
-			storage = new InMemoryResultStorage(new TestStorageService(), new NullLogService());
-			results = new TestTestResultService(new MockContextKeyService(), storage, new TestProfileService(new MockContextKeyService(), new TestStorageService()));
+			storage = ds.add(new InMemoryResultStorage(ds.add(new TestStorageService()), new NullLogService()));
+			results = new TestTestResultService(new MockContextKeyService(), storage, ds.add(new TestProfileService(new MockContextKeyService(), ds.add(new TestStorageService()))));
 		});
 
 		test('pushes new result', () => {
@@ -208,7 +226,7 @@ suite('Workbench - Test Results Service', () => {
 			results = new TestResultService(
 				new MockContextKeyService(),
 				storage,
-				new TestProfileService(new MockContextKeyService(), new TestStorageService()),
+				ds.add(new TestProfileService(new MockContextKeyService(), ds.add(new TestStorageService()))),
 			);
 
 			assert.strictEqual(0, results.results.length);
diff --git a/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts b/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
index a46e0e630a6..98d828c0a3d 100644
--- a/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
@@ -5,6 +5,8 @@
 
 import * as assert from 'assert';
 import { range } from 'vs/base/common/arrays';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { ITestResult, LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult';
 import { InMemoryResultStorage, RETAIN_MAX_RESULTS } from 'vs/workbench/contrib/testing/common/testResultStorage';
@@ -13,16 +15,17 @@ import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServic
 
 suite('Workbench - Test Result Storage', () => {
 	let storage: InMemoryResultStorage;
+	let ds: DisposableStore;
 
 	const makeResult = (taskName = 't') => {
-		const t = new LiveTestResult(
+		const t = ds.add(new LiveTestResult(
 			'',
 			true,
 			{ targets: [] }
-		);
+		));
 
 		t.addTask({ id: taskName, name: undefined, running: true });
-		const tests = testStubs.nested();
+		const tests = ds.add(testStubs.nested());
 		tests.expand(tests.root.id, Infinity);
 		t.addTestChainToRun('ctrlId', [
 			tests.root.toTestItem(),
@@ -38,9 +41,14 @@ suite('Workbench - Test Result Storage', () => {
 		assert.deepStrictEqual((await storage.read()).map(r => r.id), stored.map(s => s.id));
 
 	setup(async () => {
-		storage = new InMemoryResultStorage(new TestStorageService(), new NullLogService());
+		ds = new DisposableStore();
+		storage = ds.add(new InMemoryResultStorage(ds.add(new TestStorageService()), new NullLogService()));
 	});
 
+	teardown(() => ds.dispose());
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('stores a single result', async () => {
 		const r = range(5).map(() => makeResult());
 		await storage.persist(r);
diff --git a/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts b/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts
index b2e1bdf7112..6dd030f9b53 100644
--- a/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts
@@ -4,9 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { buildTestUri, ParsedTestUri, parseTestUri, TestUriType } from 'vs/workbench/contrib/testing/common/testingUri';
 
 suite('Workbench - Testing URIs', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('round trip', () => {
 		const uris: ParsedTestUri[] = [
 			{ type: TestUriType.ResultActualOutput, taskIndex: 1, messageIndex: 42, resultId: 'r', testExtId: 't' },

From d52c8b0f33aa390ab58c6329512fa1c01ec39229 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 5 Sep 2023 16:46:40 +0200
Subject: [PATCH 84/94] chore - avoid duplicate imports

---
 src/vs/base/browser/ui/grid/grid.ts           |  3 +-
 .../minimap/minimapCharRendererFactory.ts     |  3 +-
 .../workbench/api/common/extHostTreeViews.ts  | 31 +++++++++----------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/vs/base/browser/ui/grid/grid.ts b/src/vs/base/browser/ui/grid/grid.ts
index 2562b2fa153..821567ccf59 100644
--- a/src/vs/base/browser/ui/grid/grid.ts
+++ b/src/vs/base/browser/ui/grid/grid.ts
@@ -8,8 +8,7 @@ import { equals, tail2 as tail } from 'vs/base/common/arrays';
 import { Event } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
 import 'vs/css!./gridview';
-import { Box, GridView, IGridViewOptions, IGridViewStyles, IView as IGridViewView, IViewSize, orthogonal, Sizing as GridViewSizing } from './gridview';
-import type { GridLocation } from 'vs/base/browser/ui/grid/gridview';
+import { Box, GridView, IGridViewOptions, IGridViewStyles, IView as IGridViewView, IViewSize, orthogonal, Sizing as GridViewSizing, GridLocation } from './gridview';
 import type { SplitView, AutoSizing as SplitViewAutoSizing } from 'vs/base/browser/ui/splitview/splitview';
 
 export { IViewSize, LayoutPriority, Orientation, orthogonal } from './gridview';
diff --git a/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.ts b/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.ts
index 152aeb832ae..7b0b9bfcd21 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.ts
@@ -4,9 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { MinimapCharRenderer } from 'vs/editor/browser/viewParts/minimap/minimapCharRenderer';
-import { allCharCodes } from 'vs/editor/browser/viewParts/minimap/minimapCharSheet';
+import { allCharCodes, Constants } from 'vs/editor/browser/viewParts/minimap/minimapCharSheet';
 import { prebakedMiniMaps } from 'vs/editor/browser/viewParts/minimap/minimapPreBaked';
-import { Constants } from './minimapCharSheet';
 import { toUint8 } from 'vs/base/common/uint';
 
 /**
diff --git a/src/vs/workbench/api/common/extHostTreeViews.ts b/src/vs/workbench/api/common/extHostTreeViews.ts
index 844b0b63eae..3de4e43cbf9 100644
--- a/src/vs/workbench/api/common/extHostTreeViews.ts
+++ b/src/vs/workbench/api/common/extHostTreeViews.ts
@@ -5,7 +5,6 @@
 
 import { localize } from 'vs/nls';
 import type * as vscode from 'vscode';
-import * as types from './extHostTypes';
 import { basename } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -14,7 +13,7 @@ import { CheckboxUpdate, DataTransferDTO, ExtHostTreeViewsShape, MainThreadTreeV
 import { ITreeItem, TreeViewItemHandleArg, ITreeItemLabel, IRevealOptions, TreeCommand, TreeViewPaneHandleArg, ITreeItemCheckboxState, NoTreeViewError } from 'vs/workbench/common/views';
 import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
 import { asPromise } from 'vs/base/common/async';
-import { TreeItemCollapsibleState, TreeItemCheckboxState, ThemeIcon, MarkdownString as MarkdownStringType, TreeItem, ViewBadge as ExtHostViewBadge } from 'vs/workbench/api/common/extHostTypes';
+import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
 import { isUndefinedOrNull, isString } from 'vs/base/common/types';
 import { equals, coalesce } from 'vs/base/common/arrays';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -134,7 +133,7 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
 				return treeView.badge;
 			},
 			set badge(badge: vscode.ViewBadge | undefined) {
-				if ((badge !== undefined) && ExtHostViewBadge.isViewBadge(badge)) {
+				if ((badge !== undefined) && extHostTypes.ViewBadge.isViewBadge(badge)) {
 					treeView.badge = {
 						value: Math.floor(Math.abs(badge.value)),
 						tooltip: badge.tooltip
@@ -203,7 +202,7 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
 			return Promise.reject(new NoTreeViewError(sourceViewId));
 		}
 
-		const treeDataTransfer = await this.addAdditionalTransferItems(new types.DataTransfer(), treeView, sourceTreeItemHandles, token, operationUuid);
+		const treeDataTransfer = await this.addAdditionalTransferItems(new extHostTypes.DataTransfer(), treeView, sourceTreeItemHandles, token, operationUuid);
 		if (!treeDataTransfer || token.isCancellationRequested) {
 			return;
 		}
@@ -514,21 +513,21 @@ class ExtHostTreeView<T> extends Disposable {
 	}
 
 	async setCheckboxState(checkboxUpdates: CheckboxUpdate[]) {
-		type CheckboxUpdateWithItem = { extensionItem: NonNullable<T>; treeItem: vscode.TreeItem; newState: TreeItemCheckboxState };
+		type CheckboxUpdateWithItem = { extensionItem: NonNullable<T>; treeItem: vscode.TreeItem; newState: extHostTypes.TreeItemCheckboxState };
 		const items = (await Promise.all(checkboxUpdates.map(async checkboxUpdate => {
 			const extensionItem = this.getExtensionElement(checkboxUpdate.treeItemHandle);
 			if (extensionItem) {
 				return {
 					extensionItem: extensionItem,
 					treeItem: await this.dataProvider.getTreeItem(extensionItem),
-					newState: checkboxUpdate.newState ? TreeItemCheckboxState.Checked : TreeItemCheckboxState.Unchecked
+					newState: checkboxUpdate.newState ? extHostTypes.TreeItemCheckboxState.Checked : extHostTypes.TreeItemCheckboxState.Unchecked
 				};
 			}
 			return Promise.resolve(undefined);
 		}))).filter<CheckboxUpdateWithItem>((item): item is CheckboxUpdateWithItem => item !== undefined);
 
 		items.forEach(item => {
-			item.treeItem.checkboxState = item.newState ? TreeItemCheckboxState.Checked : TreeItemCheckboxState.Unchecked;
+			item.treeItem.checkboxState = item.newState ? extHostTypes.TreeItemCheckboxState.Checked : extHostTypes.TreeItemCheckboxState.Unchecked;
 		});
 
 		this._onDidChangeCheckboxState.fire({ items: items.map(item => [item.extensionItem, item.newState]) });
@@ -767,7 +766,7 @@ class ExtHostTreeView<T> extends Disposable {
 	}
 
 	private getTooltip(tooltip?: string | vscode.MarkdownString): string | IMarkdownString | undefined {
-		if (MarkdownStringType.isMarkdownString(tooltip)) {
+		if (extHostTypes.MarkdownString.isMarkdownString(tooltip)) {
 			return MarkdownString.from(tooltip);
 		}
 		return tooltip;
@@ -781,7 +780,7 @@ class ExtHostTreeView<T> extends Disposable {
 		if (extensionTreeItem.checkboxState === undefined) {
 			return undefined;
 		}
-		let checkboxState: TreeItemCheckboxState;
+		let checkboxState: extHostTypes.TreeItemCheckboxState;
 		let tooltip: string | undefined = undefined;
 		let accessibilityInformation: IAccessibilityInformation | undefined = undefined;
 		if (typeof extensionTreeItem.checkboxState === 'number') {
@@ -791,11 +790,11 @@ class ExtHostTreeView<T> extends Disposable {
 			tooltip = extensionTreeItem.checkboxState.tooltip;
 			accessibilityInformation = extensionTreeItem.checkboxState.accessibilityInformation;
 		}
-		return { isChecked: checkboxState === TreeItemCheckboxState.Checked, tooltip, accessibilityInformation };
+		return { isChecked: checkboxState === extHostTypes.TreeItemCheckboxState.Checked, tooltip, accessibilityInformation };
 	}
 
 	private validateTreeItem(extensionTreeItem: vscode.TreeItem) {
-		if (!TreeItem.isTreeItem(extensionTreeItem, this.extension)) {
+		if (!extHostTypes.TreeItem.isTreeItem(extensionTreeItem, this.extension)) {
 			throw new Error(`Extension ${this.extension.identifier.value} has provided an invalid tree item.`);
 		}
 	}
@@ -817,7 +816,7 @@ class ExtHostTreeView<T> extends Disposable {
 			icon,
 			iconDark: this.getDarkIconPath(extensionTreeItem) || icon,
 			themeIcon: this.getThemeIcon(extensionTreeItem),
-			collapsibleState: isUndefinedOrNull(extensionTreeItem.collapsibleState) ? TreeItemCollapsibleState.None : extensionTreeItem.collapsibleState,
+			collapsibleState: isUndefinedOrNull(extensionTreeItem.collapsibleState) ? extHostTypes.TreeItemCollapsibleState.None : extensionTreeItem.collapsibleState,
 			accessibilityInformation: extensionTreeItem.accessibilityInformation,
 			checkbox: this.getCheckbox(extensionTreeItem),
 		};
@@ -832,8 +831,8 @@ class ExtHostTreeView<T> extends Disposable {
 		};
 	}
 
-	private getThemeIcon(extensionTreeItem: vscode.TreeItem): ThemeIcon | undefined {
-		return extensionTreeItem.iconPath instanceof ThemeIcon ? extensionTreeItem.iconPath : undefined;
+	private getThemeIcon(extensionTreeItem: vscode.TreeItem): extHostTypes.ThemeIcon | undefined {
+		return extensionTreeItem.iconPath instanceof extHostTypes.ThemeIcon ? extensionTreeItem.iconPath : undefined;
 	}
 
 	private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent: TreeNode | Root, returnFirst?: boolean): TreeItemHandle {
@@ -865,7 +864,7 @@ class ExtHostTreeView<T> extends Disposable {
 	}
 
 	private getLightIconPath(extensionTreeItem: vscode.TreeItem): URI | undefined {
-		if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon)) {
+		if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof extHostTypes.ThemeIcon)) {
 			if (typeof extensionTreeItem.iconPath === 'string'
 				|| URI.isUri(extensionTreeItem.iconPath)) {
 				return this.getIconPath(extensionTreeItem.iconPath);
@@ -876,7 +875,7 @@ class ExtHostTreeView<T> extends Disposable {
 	}
 
 	private getDarkIconPath(extensionTreeItem: vscode.TreeItem): URI | undefined {
-		if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon) && (<{ light: string | URI; dark: string | URI }>extensionTreeItem.iconPath).dark) {
+		if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof extHostTypes.ThemeIcon) && (<{ light: string | URI; dark: string | URI }>extensionTreeItem.iconPath).dark) {
 			return this.getIconPath((<{ light: string | URI; dark: string | URI }>extensionTreeItem.iconPath).dark);
 		}
 		return undefined;

From 37aed2e103024d8992fe42cd95aded33db26e502 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 5 Sep 2023 08:19:22 -0700
Subject: [PATCH 85/94] eng: replace Event.chain with Event.chain2 (#192202)

Followup from #192026

Removes the original leak-prone implementation of Event.chain and
replaces it with `chain2` which only requires disposable of the
resulting listener.
---
 src/vs/base/browser/ui/list/listWidget.ts     |  14 +-
 .../browser/ui/selectBox/selectBoxCustom.ts   |  27 ++--
 src/vs/base/browser/ui/tree/abstractTree.ts   |  12 +-
 src/vs/base/common/event.ts                   | 124 +++---------------
 src/vs/base/test/common/event.test.ts         |  10 +-
 .../browser/parameterHintsWidget.ts           |   9 +-
 src/vs/platform/opener/browser/link.ts        |   8 +-
 .../quickinput/browser/quickInputUtils.ts     |   4 +-
 .../notifications/notificationsViewer.ts      |   4 +-
 .../suggestEnabledInput.ts                    |   5 +-
 .../extensions/browser/extensionEditor.ts     |  10 +-
 .../extensions/common/extensionsUtils.ts      |  11 +-
 .../contrib/markers/browser/markersTable.ts   |  10 +-
 .../services/notebookKeymapServiceImpl.ts     |  11 +-
 .../contrib/scm/browser/dirtydiffDecorator.ts |  10 +-
 15 files changed, 95 insertions(+), 174 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index 070cc08eeb4..ed0ad4678b7 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -297,7 +297,7 @@ class KeyboardController<T> implements IDisposable {
 
 	@memoize
 	private get onKeyDown(): Event<StandardKeyboardEvent> {
-		return Event.chain2(
+		return Event.chain(
 			this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
 			$.filter(e => !isInputElement(e.target as HTMLElement))
 				.map(e => new StandardKeyboardEvent(e))
@@ -474,7 +474,7 @@ class TypeNavigationController<T> implements IDisposable {
 
 		let typing = false;
 
-		const onChar = Event.chain2(this.enabledDisposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
+		const onChar = Event.chain(this.enabledDisposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
 			$.filter(e => !isInputElement(e.target as HTMLElement))
 				.filter(() => this.mode === TypeNavigationMode.Automatic || this.triggered)
 				.map(event => new StandardKeyboardEvent(event))
@@ -580,12 +580,12 @@ class DOMFocusController<T> implements IDisposable {
 		private list: List<T>,
 		private view: IListView<T>
 	) {
-		const onKeyDown = Event.chain2(this.disposables.add(new DomEmitter(view.domNode, 'keydown')).event, $ => $
+		const onKeyDown = Event.chain(this.disposables.add(new DomEmitter(view.domNode, 'keydown')).event, $ => $
 			.filter(e => !isInputElement(e.target as HTMLElement))
 			.map(e => new StandardKeyboardEvent(e))
 		);
 
-		const onTab = Event.chain2(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Tab && !e.ctrlKey && !e.metaKey && !e.shiftKey && !e.altKey));
+		const onTab = Event.chain(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Tab && !e.ctrlKey && !e.metaKey && !e.shiftKey && !e.altKey));
 
 		onTab(this.onTab, this, this.disposables);
 	}
@@ -1360,13 +1360,13 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 	@memoize get onContextMenu(): Event<IListContextMenuEvent<T>> {
 		let didJustPressContextMenuKey = false;
 
-		const fromKeyDown: Event<any> = Event.chain2(this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
+		const fromKeyDown: Event<any> = Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event, $ =>
 			$.map(e => new StandardKeyboardEvent(e))
 				.filter(e => didJustPressContextMenuKey = e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10))
 				.map(e => EventHelper.stop(e, true))
 				.filter(() => false));
 
-		const fromKeyUp = Event.chain2(this.disposables.add(new DomEmitter(this.view.domNode, 'keyup')).event, $ =>
+		const fromKeyUp = Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keyup')).event, $ =>
 			$.forEach(() => didJustPressContextMenuKey = false)
 				.map(e => new StandardKeyboardEvent(e))
 				.filter(e => e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10))
@@ -1379,7 +1379,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 					return { index, element, anchor, browserEvent };
 				}));
 
-		const fromMouse = Event.chain2(this.view.onContextMenu, $ =>
+		const fromMouse = Event.chain(this.view.onContextMenu, $ =>
 			$.filter(_ => !didJustPressContextMenuKey)
 				.map(({ element, index, browserEvent }) => ({ element, index, anchor: new StandardMouseEvent(browserEvent), browserEvent }))
 		);
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index 898d768e870..819921c07ea 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -752,20 +752,21 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 
 		// SetUp list keyboard controller - control navigation, disabled items, focus
 		const onKeyDown = this._register(new DomEmitter(this.selectDropDownListContainer, 'keydown'));
-		const onSelectDropDownKeyDown = Event.chain(onKeyDown.event)
-			.filter(() => this.selectList.length > 0)
-			.map(e => new StandardKeyboardEvent(e));
+		const onSelectDropDownKeyDown = Event.chain(onKeyDown.event, $ =>
+			$.filter(() => this.selectList.length > 0)
+				.map(e => new StandardKeyboardEvent(e))
+		);
 
-		this._register(onSelectDropDownKeyDown.filter(e => e.keyCode === KeyCode.Enter).on(e => this.onEnter(e), this));
-		this._register(onSelectDropDownKeyDown.filter(e => e.keyCode === KeyCode.Tab).on(e => this.onEnter(e), this)); // Tab should behave the same as enter, #79339
-		this._register(onSelectDropDownKeyDown.filter(e => e.keyCode === KeyCode.Escape).on(e => this.onEscape(e), this));
-		this._register(onSelectDropDownKeyDown.filter(e => e.keyCode === KeyCode.UpArrow).on(e => this.onUpArrow(e), this));
-		this._register(onSelectDropDownKeyDown.filter(e => e.keyCode === KeyCode.DownArrow).on(e => this.onDownArrow(e), this));
-		this._register(onSelectDropDownKeyDown.filter(e => e.keyCode === KeyCode.PageDown).on(this.onPageDown, this));
-		this._register(onSelectDropDownKeyDown.filter(e => e.keyCode === KeyCode.PageUp).on(this.onPageUp, this));
-		this._register(onSelectDropDownKeyDown.filter(e => e.keyCode === KeyCode.Home).on(this.onHome, this));
-		this._register(onSelectDropDownKeyDown.filter(e => e.keyCode === KeyCode.End).on(this.onEnd, this));
-		this._register(onSelectDropDownKeyDown.filter(e => (e.keyCode >= KeyCode.Digit0 && e.keyCode <= KeyCode.KeyZ) || (e.keyCode >= KeyCode.Semicolon && e.keyCode <= KeyCode.NumpadDivide)).on(this.onCharacter, this));
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Enter))(this.onEnter, this));
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Tab))(this.onEnter, this)); // Tab should behave the same as enter, #79339
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Escape))(this.onEscape, this));
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => e.keyCode === KeyCode.UpArrow))(this.onUpArrow, this));
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => e.keyCode === KeyCode.DownArrow))(this.onDownArrow, this));
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => e.keyCode === KeyCode.PageDown))(this.onPageDown, this));
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => e.keyCode === KeyCode.PageUp))(this.onPageUp, this));
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Home))(this.onHome, this));
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => e.keyCode === KeyCode.End))(this.onEnd, this));
+		this._register(Event.chain(onSelectDropDownKeyDown, $ => $.filter(e => (e.keyCode >= KeyCode.Digit0 && e.keyCode <= KeyCode.KeyZ) || (e.keyCode >= KeyCode.Semicolon && e.keyCode <= KeyCode.NumpadDivide)))(this.onCharacter, this));
 
 		// SetUp list mouse controller - control navigation, disabled items, focus
 		this._register(dom.addDisposableListener(this.selectList.getHTMLElement(), dom.EventType.POINTER_UP, e => this.onPointerUp(e)));
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index 4327f53551f..5376fe98462 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -814,7 +814,7 @@ class FindWidget<T, TFilterData> extends Disposable {
 		this.mode = mode;
 
 		const emitter = this._register(new DomEmitter(this.findInput.inputBox.inputElement, 'keydown'));
-		const onKeyDown = Event.chain2(emitter.event, $ => $.map(e => new StandardKeyboardEvent(e)));
+		const onKeyDown = Event.chain(emitter.event, $ => $.map(e => new StandardKeyboardEvent(e)));
 
 		this._register(onKeyDown((e): any => {
 			// Using equals() so we reserve modified keys for future use
@@ -884,7 +884,7 @@ class FindWidget<T, TFilterData> extends Disposable {
 			}));
 		}));
 
-		const onGrabKeyDown = Event.chain2(this._register(new DomEmitter(this.elements.grab, 'keydown')).event, $ => $.map(e => new StandardKeyboardEvent(e)));
+		const onGrabKeyDown = Event.chain(this._register(new DomEmitter(this.elements.grab, 'keydown')).event, $ => $.map(e => new StandardKeyboardEvent(e)));
 
 		this._register(onGrabKeyDown((e): any => {
 			let right: number | undefined;
@@ -1640,14 +1640,14 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		onDidChangeActiveNodes.input = activeNodesEmitter.event;
 
 		if (_options.keyboardSupport !== false) {
-			const onKeyDown = Event.chain2(this.view.onKeyDown, $ =>
+			const onKeyDown = Event.chain(this.view.onKeyDown, $ =>
 				$.filter(e => !isInputElement(e.target as HTMLElement))
 					.map(e => new StandardKeyboardEvent(e))
 			);
 
-			Event.chain2(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.LeftArrow))(this.onLeftArrow, this, this.disposables);
-			Event.chain2(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.RightArrow))(this.onRightArrow, this, this.disposables);
-			Event.chain2(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Space))(this.onSpace, this, this.disposables);
+			Event.chain(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.LeftArrow))(this.onLeftArrow, this, this.disposables);
+			Event.chain(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.RightArrow))(this.onRightArrow, this, this.disposables);
+			Event.chain(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Space))(this.onSpace, this, this.disposables);
 		}
 
 		if ((_options.findWidgetEnabled ?? true) && _options.keyboardNavigationLabelProvider && _options.contextViewProvider) {
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 7f3b4406d7a..2e5f7fc27a1 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -437,21 +437,33 @@ export namespace Event {
 
 		return emitter.event;
 	}
-
 	/**
-	 * Implements event chaining, in a way that avoids having disposable
-	 * intermediates at each step like {@link chain} does.
+	 * Wraps the event in an {@link IChainableEvent}, allowing a more functional programming style.
+	 *
+	 * @example
+	 * ```
+	 * // Normal
+	 * const onEnterPressNormal = Event.filter(
+	 *   Event.map(onKeyPress.event, e => new StandardKeyboardEvent(e)),
+	 *   e.keyCode === KeyCode.Enter
+	 * ).event;
+	 *
+	 * // Using chain
+	 * const onEnterPressChain = Event.chain(onKeyPress.event, $ => $
+	 *   .map(e => new StandardKeyboardEvent(e))
+	 *   .filter(e => e.keyCode === KeyCode.Enter)
+	 * );
+	 * ```
 	 */
-	export function chain2<T, R>(event: Event<T>, sythensize: ($: IChainableSythensis<T>) => IChainableSythensis<R>): Event<R> {
+	export function chain<T, R>(event: Event<T>, sythensize: ($: IChainableSythensis<T>) => IChainableSythensis<R>): Event<R> {
 		const fn: Event<R> = (listener, thisArgs, disposables) => {
-			const cs = new ChainableSynthesis();
-			sythensize(cs);
-			return event(value => {
+			const cs = sythensize(new ChainableSynthesis()) as ChainableSynthesis;
+			return event(function (value) {
 				const result = cs.evaluate(value);
 				if (result !== HaltChainable) {
-					listener(result);
+					listener.call(thisArgs, result);
 				}
-			}, thisArgs, disposables);
+			}, undefined, disposables);
 		};
 
 		return fn;
@@ -524,100 +536,6 @@ export namespace Event {
 		latch(equals?: (a: T, b: T) => boolean): IChainableSythensis<T>;
 	}
 
-	export interface IChainableEvent<T> extends IDisposable {
-
-		event: Event<T>;
-		map<O>(fn: (i: T) => O): IChainableEvent<O>;
-		forEach(fn: (i: T) => void): IChainableEvent<T>;
-		filter(fn: (e: T) => boolean): IChainableEvent<T>;
-		filter<R>(fn: (e: T | R) => e is R): IChainableEvent<R>;
-		reduce<R>(merge: (last: R | undefined, event: T) => R, initial?: R): IChainableEvent<R>;
-		latch(): IChainableEvent<T>;
-		debounce(merge: (last: T | undefined, event: T) => T, delay?: number, leading?: boolean, flushOnListenerRemove?: boolean, leakWarningThreshold?: number): IChainableEvent<T>;
-		debounce<R>(merge: (last: R | undefined, event: T) => R, delay?: number, leading?: boolean, flushOnListenerRemove?: boolean, leakWarningThreshold?: number): IChainableEvent<R>;
-		on(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;
-		once(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[]): IDisposable;
-	}
-
-	class ChainableEvent<T> implements IChainableEvent<T> {
-
-		private readonly disposables = new DisposableStore();
-
-		constructor(readonly event: Event<T>) { }
-
-		/** @see {@link Event.map} */
-		map<O>(fn: (i: T) => O): IChainableEvent<O> {
-			return new ChainableEvent(map(this.event, fn, this.disposables));
-		}
-
-		/** @see {@link Event.forEach} */
-		forEach(fn: (i: T) => void): IChainableEvent<T> {
-			return new ChainableEvent(forEach(this.event, fn, this.disposables));
-		}
-
-		/** @see {@link Event.filter} */
-		filter(fn: (e: T) => boolean): IChainableEvent<T>;
-		filter<R>(fn: (e: T | R) => e is R): IChainableEvent<R>;
-		filter(fn: (e: T) => boolean): IChainableEvent<T> {
-			return new ChainableEvent(filter(this.event, fn, this.disposables));
-		}
-
-		/** @see {@link Event.reduce} */
-		reduce<R>(merge: (last: R | undefined, event: T) => R, initial?: R): IChainableEvent<R> {
-			return new ChainableEvent(reduce(this.event, merge, initial, this.disposables));
-		}
-
-		/** @see {@link Event.reduce} */
-		latch(): IChainableEvent<T> {
-			return new ChainableEvent(latch(this.event, undefined, this.disposables));
-		}
-
-		/** @see {@link Event.debounce} */
-		debounce(merge: (last: T | undefined, event: T) => T, delay?: number, leading?: boolean, flushOnListenerRemove?: boolean, leakWarningThreshold?: number): IChainableEvent<T>;
-		debounce<R>(merge: (last: R | undefined, event: T) => R, delay?: number, leading?: boolean, flushOnListenerRemove?: boolean, leakWarningThreshold?: number): IChainableEvent<R>;
-		debounce<R>(merge: (last: R | undefined, event: T) => R, delay: number = 100, leading = false, flushOnListenerRemove = false, leakWarningThreshold?: number): IChainableEvent<R> {
-			return new ChainableEvent(debounce(this.event, merge, delay, leading, flushOnListenerRemove, leakWarningThreshold, this.disposables));
-		}
-
-		/**
-		 * Attach a listener to the event.
-		 */
-		on(listener: (e: T) => any, thisArgs: any, disposables: IDisposable[] | DisposableStore) {
-			return this.event(listener, thisArgs, disposables);
-		}
-
-		/** @see {@link Event.once} */
-		once(listener: (e: T) => any, thisArgs: any, disposables: IDisposable[]) {
-			return once(this.event)(listener, thisArgs, disposables);
-		}
-
-		dispose() {
-			this.disposables.dispose();
-		}
-	}
-
-	/**
-	 * Wraps the event in an {@link IChainableEvent}, allowing a more functional programming style.
-	 *
-	 * @example
-	 * ```
-	 * // Normal
-	 * const onEnterPressNormal = Event.filter(
-	 *   Event.map(onKeyPress.event, e => new StandardKeyboardEvent(e)),
-	 *   e.keyCode === KeyCode.Enter
-	 * ).event;
-	 *
-	 * // Using chain
-	 * const onEnterPressChain = Event.chain(onKeyPress.event)
-	 *   .map(e => new StandardKeyboardEvent(e))
-	 *   .filter(e => e.keyCode === KeyCode.Enter)
-	 *   .event;
-	 * ```
-	 */
-	export function chain<T>(event: Event<T>): IChainableEvent<T> {
-		return new ChainableEvent(event);
-	}
-
 	export interface NodeEventEmitter {
 		on(event: string | symbol, listener: Function): unknown;
 		removeListener(event: string | symbol, listener: Function): unknown;
diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts
index c2ef872140e..54b1e1f48c9 100644
--- a/src/vs/base/test/common/event.test.ts
+++ b/src/vs/base/test/common/event.test.ts
@@ -1527,7 +1527,7 @@ suite('Event utils', () => {
 		});
 
 		test('maps', () => {
-			const ev = Event.chain2(em.event, $ => $.map(v => v * 2));
+			const ev = Event.chain(em.event, $ => $.map(v => v * 2));
 			store.add(ev(v => calls.push(v)));
 			em.fire(1);
 			em.fire(2);
@@ -1536,7 +1536,7 @@ suite('Event utils', () => {
 		});
 
 		test('filters', () => {
-			const ev = Event.chain2(em.event, $ => $.filter(v => v % 2 === 0));
+			const ev = Event.chain(em.event, $ => $.filter(v => v % 2 === 0));
 			store.add(ev(v => calls.push(v)));
 			em.fire(1);
 			em.fire(2);
@@ -1546,7 +1546,7 @@ suite('Event utils', () => {
 		});
 
 		test('reduces', () => {
-			const ev = Event.chain2(em.event, $ => $.reduce((acc, v) => acc + v, 0));
+			const ev = Event.chain(em.event, $ => $.reduce((acc, v) => acc + v, 0));
 			store.add(ev(v => calls.push(v)));
 			em.fire(1);
 			em.fire(2);
@@ -1556,7 +1556,7 @@ suite('Event utils', () => {
 		});
 
 		test('latches', () => {
-			const ev = Event.chain2(em.event, $ => $.latch());
+			const ev = Event.chain(em.event, $ => $.latch());
 			store.add(ev(v => calls.push(v)));
 			em.fire(1);
 			em.fire(1);
@@ -1569,7 +1569,7 @@ suite('Event utils', () => {
 		});
 
 		test('does everything', () => {
-			const ev = Event.chain2(em.event, $ => $
+			const ev = Event.chain(em.event, $ => $
 				.filter(v => v % 2 === 0)
 				.map(v => v * 2)
 				.reduce((acc, v) => acc + v, 0)
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
index 77094d0b005..c595faccc73 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
@@ -14,7 +14,7 @@ import { escapeRegExpCharacters } from 'vs/base/common/strings';
 import { assertIsDefined } from 'vs/base/common/types';
 import 'vs/css!./parameterHints';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
+import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import * as languages from 'vs/editor/common/languages';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
@@ -130,9 +130,10 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 
 		updateFont();
 
-		this._register(Event.chain<ConfigurationChangedEvent>(this.editor.onDidChangeConfiguration.bind(this.editor))
-			.filter(e => e.hasChanged(EditorOption.fontInfo))
-			.on(updateFont, null));
+		this._register(Event.chain(
+			this.editor.onDidChangeConfiguration.bind(this.editor),
+			$ => $.filter(e => e.hasChanged(EditorOption.fontInfo))
+		)(updateFont));
 
 		this._register(this.editor.onDidLayoutChange(e => this.updateMaxHeight()));
 		this.updateMaxHeight();
diff --git a/src/vs/platform/opener/browser/link.ts b/src/vs/platform/opener/browser/link.ts
index 3b176459eed..2b455fa8dc6 100644
--- a/src/vs/platform/opener/browser/link.ts
+++ b/src/vs/platform/opener/browser/link.ts
@@ -93,10 +93,10 @@ export class Link extends Disposable {
 
 		const onClickEmitter = this._register(new DomEmitter(this.el, 'click'));
 		const onKeyPress = this._register(new DomEmitter(this.el, 'keypress'));
-		const onEnterPress = Event.chain(onKeyPress.event)
-			.map(e => new StandardKeyboardEvent(e))
-			.filter(e => e.keyCode === KeyCode.Enter)
-			.event;
+		const onEnterPress = Event.chain(onKeyPress.event, $ =>
+			$.map(e => new StandardKeyboardEvent(e))
+				.filter(e => e.keyCode === KeyCode.Enter)
+		);
 		const onTap = this._register(new DomEmitter(this.el, TouchEventType.Tap)).event;
 		this._register(Gesture.addTarget(this.el));
 		const onOpen = Event.any<EventLike>(onClickEmitter.event, onEnterPress, onTap);
diff --git a/src/vs/platform/quickinput/browser/quickInputUtils.ts b/src/vs/platform/quickinput/browser/quickInputUtils.ts
index 65df79a2d18..1c9566a6622 100644
--- a/src/vs/platform/quickinput/browser/quickInputUtils.ts
+++ b/src/vs/platform/quickinput/browser/quickInputUtils.ts
@@ -67,11 +67,11 @@ export function renderQuickInputDescription(description: string, container: HTML
 
 			const onClick = actionHandler.disposables.add(new DomEmitter(anchor, dom.EventType.CLICK)).event;
 			const onKeydown = actionHandler.disposables.add(new DomEmitter(anchor, dom.EventType.KEY_DOWN)).event;
-			const onSpaceOrEnter = actionHandler.disposables.add(Event.chain(onKeydown)).filter(e => {
+			const onSpaceOrEnter = Event.chain(onKeydown, $ => $.filter(e => {
 				const event = new StandardKeyboardEvent(e);
 
 				return event.equals(KeyCode.Space) || event.equals(KeyCode.Enter);
-			}).event;
+			}));
 
 			actionHandler.disposables.add(Gesture.addTarget(anchor));
 			const onTap = actionHandler.disposables.add(new DomEmitter(anchor, GestureEventType.Tap)).event;
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index cb9d9b7ce0e..fa8a759570c 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -171,11 +171,11 @@ class NotificationMessageRenderer {
 					const onClick = actionHandler.toDispose.add(new DomEmitter(anchor, EventType.CLICK)).event;
 
 					const onKeydown = actionHandler.toDispose.add(new DomEmitter(anchor, EventType.KEY_DOWN)).event;
-					const onSpaceOrEnter = actionHandler.toDispose.add(Event.chain(onKeydown)).filter(e => {
+					const onSpaceOrEnter = Event.chain(onKeydown, $ => $.filter(e => {
 						const event = new StandardKeyboardEvent(e);
 
 						return event.equals(KeyCode.Space) || event.equals(KeyCode.Enter);
-					}).event;
+					}));
 
 					actionHandler.toDispose.add(Gesture.addTarget(anchor));
 					const onTap = actionHandler.toDispose.add(new DomEmitter(anchor, GestureEventType.Tap)).event;
diff --git a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
index 8052a8efa93..85bb0e71779 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
@@ -209,9 +209,8 @@ export class SuggestEnabledInput extends Widget {
 			this.stylingContainer.classList.remove('synthetic-focus');
 		})));
 
-		const onKeyDownMonaco = Event.chain(this.inputWidget.onKeyDown);
-		this._register(onKeyDownMonaco.filter(e => e.keyCode === KeyCode.Enter).on(e => { e.preventDefault(); /** Do nothing. Enter causes new line which is not expected. */ }, this));
-		this._register(onKeyDownMonaco.filter(e => e.keyCode === KeyCode.DownArrow && (isMacintosh ? e.metaKey : e.ctrlKey)).on(() => this._onShouldFocusResults.fire(), this));
+		this._register(Event.chain(this.inputWidget.onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Enter))(e => { e.preventDefault(); /** Do nothing. Enter causes new line which is not expected. */ }, this));
+		this._register(Event.chain(this.inputWidget.onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.DownArrow && (isMacintosh ? e.metaKey : e.ctrlKey)))(() => this._onShouldFocusResults.fire(), this));
 
 		let preexistingContent = this.getValue();
 		const inputWidgetModel = this.inputWidget.getModel();
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index 16a37dc27c9..e9a2bb1d5f3 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -398,10 +398,12 @@ export class ExtensionEditor extends EditorPane {
 			this._register(disposable);
 		}
 
-		this._register(Event.chain(extensionActionBar.onDidRun)
-			.map(({ error }) => error)
-			.filter(error => !!error)
-			.on(this.onError, this));
+		const onError = Event.chain(extensionActionBar.onDidRun, $ =>
+			$.map(({ error }) => error)
+				.filter(error => !!error)
+		);
+
+		this._register(onError(this.onError, this));
 
 		const body = append(root, $('.body'));
 		const navbar = new NavBar(body);
diff --git a/src/vs/workbench/contrib/extensions/common/extensionsUtils.ts b/src/vs/workbench/contrib/extensions/common/extensionsUtils.ts
index 02afd35c0d8..1f56b42b32c 100644
--- a/src/vs/workbench/contrib/extensions/common/extensionsUtils.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensionsUtils.ts
@@ -75,13 +75,12 @@ export class KeymapExtensions extends Disposable implements IWorkbenchContributi
 function onExtensionChanged(accessor: ServicesAccessor): Event<IExtensionIdentifier[]> {
 	const extensionService = accessor.get(IExtensionManagementService);
 	const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
-	const onDidInstallExtensions = Event.chain(extensionService.onDidInstallExtensions)
-		.filter(e => e.some(({ operation }) => operation === InstallOperation.Install))
-		.map(e => e.map(({ identifier }) => identifier))
-		.event;
+	const onDidInstallExtensions = Event.chain(extensionService.onDidInstallExtensions, $ =>
+		$.filter(e => e.some(({ operation }) => operation === InstallOperation.Install))
+			.map(e => e.map(({ identifier }) => identifier))
+	);
 	return Event.debounce<IExtensionIdentifier[], IExtensionIdentifier[]>(Event.any(
-		Event.chain(Event.any(onDidInstallExtensions, Event.map(extensionService.onDidUninstallExtension, e => [e.identifier])))
-			.event,
+		Event.any(onDidInstallExtensions, Event.map(extensionService.onDidUninstallExtension, e => [e.identifier])),
 		Event.map(extensionEnablementService.onEnablementChanged, extensions => extensions.map(e => e.identifier))
 	), (result: IExtensionIdentifier[] | undefined, identifiers: IExtensionIdentifier[]) => {
 		result = result || [];
diff --git a/src/vs/workbench/contrib/markers/browser/markersTable.ts b/src/vs/workbench/contrib/markers/browser/markersTable.ts
index 2a2fc816574..059f7262f5c 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTable.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTable.ts
@@ -326,11 +326,11 @@ export class MarkersTable extends Disposable implements IProblemsWidget {
 		const list = this.table.domNode.querySelector('.monaco-list-rows')! as HTMLElement;
 
 		// mouseover/mouseleave event handlers
-		const onRowHover = Event.chain(this._register(new DomEmitter(list, 'mouseover')).event)
-			.map(e => DOM.findParentWithClass(e.target as HTMLElement, 'monaco-list-row', 'monaco-list-rows'))
-			.filter<HTMLElement>(((e: HTMLElement | null) => !!e) as any)
-			.map(e => parseInt(e.getAttribute('data-index')!))
-			.event;
+		const onRowHover = Event.chain(this._register(new DomEmitter(list, 'mouseover')).event, $ =>
+			$.map(e => DOM.findParentWithClass(e.target as HTMLElement, 'monaco-list-row', 'monaco-list-rows'))
+				.filter<HTMLElement>(((e: HTMLElement | null) => !!e) as any)
+				.map(e => parseInt(e.getAttribute('data-index')!))
+		);
 
 		const onListLeave = Event.map(this._register(new DomEmitter(list, 'mouseleave')).event, () => -1);
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.ts
index 19de4fc4458..8682f88efc3 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.ts
@@ -22,13 +22,12 @@ import { distinct } from 'vs/base/common/arrays';
 function onExtensionChanged(accessor: ServicesAccessor): Event<IExtensionIdentifier[]> {
 	const extensionService = accessor.get(IExtensionManagementService);
 	const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
-	const onDidInstallExtensions = Event.chain(extensionService.onDidInstallExtensions)
-		.filter(e => e.some(({ operation }) => operation === InstallOperation.Install))
-		.map(e => e.map(({ identifier }) => identifier))
-		.event;
+	const onDidInstallExtensions = Event.chain(extensionService.onDidInstallExtensions, $ =>
+		$.filter(e => e.some(({ operation }) => operation === InstallOperation.Install))
+			.map(e => e.map(({ identifier }) => identifier))
+	);
 	return Event.debounce<IExtensionIdentifier[], IExtensionIdentifier[]>(Event.any(
-		Event.chain(Event.any(onDidInstallExtensions, Event.map(extensionService.onDidUninstallExtension, e => [e.identifier])))
-			.event,
+		Event.any(onDidInstallExtensions, Event.map(extensionService.onDidUninstallExtension, e => [e.identifier])),
 		Event.map(extensionEnablementService.onEnablementChanged, extensions => extensions.map(e => e.identifier))
 	), (result: IExtensionIdentifier[] | undefined, identifiers: IExtensionIdentifier[]) => {
 		result = result || (identifiers.length ? [identifiers[0]] : []);
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index 45c801dff07..b6377ab09c0 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -862,10 +862,12 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 
 		const disposables = new DisposableStore();
 		disposables.add(Event.once(this.widget.onDidClose)(this.close, this));
-		Event.chain(model.onDidChange)
-			.filter(e => e.diff.length > 0)
-			.map(e => e.diff)
-			.event(this.onDidModelChange, this, disposables);
+		const onDidModelChange = Event.chain(model.onDidChange, $ =>
+			$.filter(e => e.diff.length > 0)
+				.map(e => e.diff)
+		);
+
+		onDidModelChange(this.onDidModelChange, this, disposables);
 
 		disposables.add(this.widget);
 		disposables.add(toDisposable(() => {

From 43495ec026d28ea415e42d0eb0bb75a287bff2c2 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 5 Sep 2023 10:08:30 -0700
Subject: [PATCH 86/94] Add unbalancedBracketScopes for markdown (#191844)

Fixes #191843
---
 extensions/markdown-basics/package.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/markdown-basics/package.json b/extensions/markdown-basics/package.json
index 9021acac872..52588bbd362 100644
--- a/extensions/markdown-basics/package.json
+++ b/extensions/markdown-basics/package.json
@@ -81,7 +81,11 @@
           "meta.embedded.block.typescriptreact": "typescriptreact",
           "meta.embedded.block.csharp": "csharp",
           "meta.embedded.block.fsharp": "fsharp"
-        }
+        },
+        "unbalancedBracketScopes": [
+          "markup.underline.link.markdown",
+          "punctuation.definition.list.begin.markdown"
+        ]
       }
     ],
     "snippets": [

From 3f791694da2bbc1fc0b42b05a8be261fe9bbebf9 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:28:45 -0700
Subject: [PATCH 87/94] Return an optional DisposableStore from leak fn

Part of #190503
---
 src/vs/base/test/common/utils.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts
index 62508dcf7f1..03641b0c23a 100644
--- a/src/vs/base/test/common/utils.ts
+++ b/src/vs/base/test/common/utils.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable, IDisposableTracker, setDisposableTracker } from 'vs/base/common/lifecycle';
+import { DisposableStore, IDisposable, IDisposableTracker, setDisposableTracker } from 'vs/base/common/lifecycle';
 import { join } from 'vs/base/common/path';
 import { isWindows } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
@@ -128,21 +128,34 @@ export class DisposableTracker implements IDisposableTracker {
  *
  * Use `markAsSingleton` if disposable singletons are created lazily that are allowed to outlive the test.
  * Make sure that the singleton properly registers all child disposables so that they are excluded too.
+ *
+ * @returns A {@link DisposableStore} that can optionally be used to track disposables in the test.
+ * This will be automatically disposed on test teardown.
 */
-export function ensureNoDisposablesAreLeakedInTestSuite() {
+export function ensureNoDisposablesAreLeakedInTestSuite(): Pick<DisposableStore, 'add'> {
 	let tracker: DisposableTracker | undefined;
+	let store: DisposableStore;
 	setup(() => {
+		store = new DisposableStore();
 		tracker = new DisposableTracker();
 		setDisposableTracker(tracker);
 	});
 
 	teardown(function (this: import('mocha').Context) {
+		store.dispose();
 		setDisposableTracker(null);
-
 		if (this.currentTest?.state !== 'failed') {
 			tracker!.ensureNoLeakingDisposables();
 		}
 	});
+
+	// Wrap store as the suite function is called before it's initialized
+	const testContext = {
+		add<T extends IDisposable>(o: T): T {
+			return store.add(o);
+		}
+	};
+	return testContext;
 }
 
 export function throwIfDisposablesAreLeaked(body: () => void): void {

From bf605359b0c5b9a33e81614dd947fbafe6cb480f Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:40:00 -0700
Subject: [PATCH 88/94] Add separator to test output

This fixes terminal link detection
---
 src/vs/base/test/common/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts
index 62508dcf7f1..c89e899b2f0 100644
--- a/src/vs/base/test/common/utils.ts
+++ b/src/vs/base/test/common/utils.ts
@@ -111,7 +111,7 @@ export class DisposableTracker implements IDisposableTracker {
 			const firstLeaking = leaking.slice(0, count);
 			const remainingCount = leaking.length - count;
 
-			const separator = '--------------------\n\n';
+			const separator = '\n--------------------\n\n';
 			let s = firstLeaking.map(l => l.source).join(separator);
 			if (remainingCount > 0) {
 				s += `${separator}+ ${remainingCount} more`;

From b29799c8cb2ebf9b94b0d4756e09388990ded54c Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:51:14 -0700
Subject: [PATCH 89/94] List widget onInput cleanup (#191882)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* code cleanup

* cleanup part 2

* Apply suggestions from code review

---------

Co-authored-by: João Moreno <mail@joaomoreno.com>
---
 src/vs/base/browser/ui/list/listWidget.ts | 26 +++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index ed0ad4678b7..1bd342c99c7 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -539,14 +539,21 @@ class TypeNavigationController<T> implements IDisposable {
 
 			if (this.list.options.typeNavigationEnabled) {
 				if (typeof labelStr !== 'undefined') {
-					const prefix = matchesPrefix(word, labelStr);
+
+					// If prefix is found, focus and return early
+					if (matchesPrefix(word, labelStr)) {
+						this.previouslyFocused = start;
+						this.list.setFocus([index]);
+						this.list.reveal(index);
+						return;
+					}
+
 					const fuzzy = matchesFuzzy2(word, labelStr);
 
 					if (fuzzy) {
 						const fuzzyScore = fuzzy[0].end - fuzzy[0].start;
-
 						// ensures that when fuzzy matching, doesn't clash with prefix matching (1 input vs 1+ should be prefix and fuzzy respecitvely). Also makes sure that exact matches are prioritized.
-						if (prefix || (fuzzyScore > 1 && fuzzy.length === 1)) {
+						if (fuzzyScore > 1 && fuzzy.length === 1) {
 							this.previouslyFocused = start;
 							this.list.setFocus([index]);
 							this.list.reveal(index);
@@ -554,13 +561,11 @@ class TypeNavigationController<T> implements IDisposable {
 						}
 					}
 				}
-			} else {
-				if (typeof labelStr === 'undefined' || matchesPrefix(word, labelStr)) {
-					this.previouslyFocused = start;
-					this.list.setFocus([index]);
-					this.list.reveal(index);
-					return;
-				}
+			} else if (typeof labelStr === 'undefined' || matchesPrefix(word, labelStr)) {
+				this.previouslyFocused = start;
+				this.list.setFocus([index]);
+				this.list.reveal(index);
+				return;
 			}
 		}
 	}
@@ -1005,7 +1010,6 @@ export interface IListOptions<T> extends IListOptionsUpdate {
 	readonly keyboardNavigationLabelProvider?: IKeyboardNavigationLabelProvider<T>;
 	readonly keyboardNavigationDelegate?: IKeyboardNavigationDelegate;
 	readonly keyboardSupport?: boolean;
-	readonly keyboardNavigationEnabled?: boolean;
 	readonly multipleSelectionController?: IMultipleSelectionController<T>;
 	readonly styleController?: (suffix: string) => IStyleController;
 	readonly accessibilityProvider?: IListAccessibilityProvider<T>;

From 9d0779ad5b16ab27539c9db6d731c8ba9d219c8b Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 5 Sep 2023 11:22:22 -0700
Subject: [PATCH 90/94] Restore default paste fallback (#192218)

Fixes #192196
---
 .../contrib/dropOrPasteInto/browser/copyPasteController.ts  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
index 30e79607eb1..f85e595c4ff 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
@@ -283,6 +283,12 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 					return;
 				}
 
+				// If the only edit returned is a text edit, use the default paste handler
+				if (providerEdits.length === 1 && providerEdits[0].providerId === 'text') {
+					await this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token);
+					return;
+				}
+
 				if (providerEdits.length) {
 					const canShowWidget = editor.getOption(EditorOption.pasteAs).showPasteSelector === 'afterPaste';
 					return this._postPasteWidgetManager.applyEditAndShowIfNeeded(selections, { activeEditIndex: 0, allEdits: providerEdits }, canShowWidget, tokenSource.token);

From 37c4f18caf92131d1015aa95c19a7ae148605806 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 5 Sep 2023 11:34:58 -0700
Subject: [PATCH 91/94] Pick up latest TS to build VS Code (#192219)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2814401b7f9..938b08591f5 100644
--- a/package.json
+++ b/package.json
@@ -212,7 +212,7 @@
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
-    "typescript": "^5.3.0-dev.20230824",
+    "typescript": "^5.3.0-dev.20230905",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.12.1",
     "util": "^0.12.4",
diff --git a/yarn.lock b/yarn.lock
index c49176e5cb6..171f2e83601 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10087,10 +10087,10 @@ typescript@^4.7.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
   integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
 
-typescript@^5.3.0-dev.20230824:
-  version "5.3.0-dev.20230824"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.0-dev.20230824.tgz#14fc65c14c588363c0d290dbbbda8ae0968fd95b"
-  integrity sha512-iiUWxGibzrRHEBLDJfVymsvpPKflf3cMrw0oQTMQoguFS2ikNlVlfQWAsYeHqGpRQc77nSQkzsE9rAHNHqvIjw==
+typescript@^5.3.0-dev.20230905:
+  version "5.3.0-dev.20230905"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.0-dev.20230905.tgz#b88de602ef4afcc3a80a9c38023df82b7529e42a"
+  integrity sha512-Nl9MoKWN0YYlCvQnw850L4ZgqdmqwVGCi9cAoQDw4PsqRGaWAi9HKizS9xu0q4qgKKsEKetWCZHT8dBtJTGaMg==
 
 typical@^4.0.0:
   version "4.0.0"

From 2ab25fade7ef55492a654389f626f613c835ad5e Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Tue, 5 Sep 2023 12:00:53 -0700
Subject: [PATCH 92/94] Match on description as well (#192227)

Fixes https://github.com/microsoft/vscode/issues/192077
---
 .../contrib/localization/common/localizationsActions.ts          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/localization/common/localizationsActions.ts b/src/vs/workbench/contrib/localization/common/localizationsActions.ts
index 1cfb6dd5fa2..4e4f83ea12a 100644
--- a/src/vs/workbench/contrib/localization/common/localizationsActions.ts
+++ b/src/vs/workbench/contrib/localization/common/localizationsActions.ts
@@ -36,6 +36,7 @@ export class ConfigureDisplayLanguageAction extends Action2 {
 		const installedLanguages = await languagePackService.getInstalledLanguages();
 
 		const qp = quickInputService.createQuickPick<ILanguagePackItem>();
+		qp.matchOnDescription = true;
 		qp.placeholder = localize('chooseLocale', "Select Display Language");
 
 		if (installedLanguages?.length) {

From a18893966caf1546eb61ba3a8d522df057ce39d9 Mon Sep 17 00:00:00 2001
From: meganrogge <megan.rogge@microsoft.com>
Date: Tue, 5 Sep 2023 15:26:18 -0400
Subject: [PATCH 93/94] use shift for linux

---
 .../browser/terminal.accessibility.contribution.ts            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
index 682d14ccde1..b0596b2d2b0 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
@@ -128,6 +128,10 @@ registerTerminalAction({
 		{
 			primary: KeyMod.Alt | KeyCode.F2,
 			secondary: [KeyMod.CtrlCmd | KeyCode.UpArrow],
+			linux: {
+				primary: KeyMod.Alt | KeyCode.F2 | KeyMod.Shift,
+				secondary: [KeyMod.CtrlCmd | KeyCode.UpArrow]
+			},
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, TerminalContextKeys.focus, ContextKeyExpr.or(terminalTabFocusModeContextKey, TerminalContextKeys.accessibleBufferFocus.negate()))
 		}

From 23616317537bd3bd5e8d0849153f78373b4ee037 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 5 Sep 2023 21:33:52 +0200
Subject: [PATCH 94/94] some `ensureNoDisposablesAreLeakedInTestSuite` work

---
 .../browser/ui/scrollbar/scrollableElement.ts |  4 +-
 .../documentSymbols/browser/outlineModel.ts   |  1 +
 .../test/browser/outlineModel.test.ts         |  9 +-
 .../test/browser/snippetController2.test.ts   | 93 ++++++++++---------
 .../editor/contrib/suggest/browser/suggest.ts |  3 +-
 .../contrib/suggest/browser/suggestWidget.ts  | 12 ++-
 .../suggest/browser/suggestWidgetStatus.ts    |  2 +
 .../test/browser/suggestController.test.ts    |  6 +-
 .../suggest/test/browser/suggestModel.test.ts | 13 ++-
 .../suggest/test/browser/wordDistance.test.ts |  3 +
 .../actions/test/common/menuService.test.ts   | 13 ++-
 11 files changed, 96 insertions(+), 63 deletions(-)

diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
index 45a3b751e41..4073f4272d0 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -626,14 +626,14 @@ export class DomScrollableElement extends AbstractScrollableElement {
 		super(element, options, scrollable);
 		this._register(scrollable);
 		this._element = element;
-		this.onScroll((e) => {
+		this._register(this.onScroll((e) => {
 			if (e.scrollTopChanged) {
 				this._element.scrollTop = e.scrollTop;
 			}
 			if (e.scrollLeftChanged) {
 				this._element.scrollLeft = e.scrollLeft;
 			}
-		});
+		}));
 		this.scanDomNode();
 	}
 
diff --git a/src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts b/src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts
index e9746fec571..61caa1c30fa 100644
--- a/src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts
+++ b/src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts
@@ -235,6 +235,7 @@ export class OutlineModel extends TreeElement {
 			}
 		}).finally(() => {
 			listener.dispose();
+			cts.dispose();
 		});
 	}
 
diff --git a/src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts b/src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts
index 2249c107004..194b8ee4f16 100644
--- a/src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts
+++ b/src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts
@@ -18,6 +18,7 @@ import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { OutlineElement, OutlineGroup, OutlineModel, OutlineModelService } from '../../browser/outlineModel';
 import { mock } from 'vs/base/test/common/mock';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('OutlineModel', function () {
 
@@ -28,6 +29,8 @@ suite('OutlineModel', function () {
 		disposables.clear();
 	});
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('OutlineModel#create, cached', async function () {
 
 		const insta = createModelServices(disposables);
@@ -61,6 +64,7 @@ suite('OutlineModel', function () {
 
 		reg.dispose();
 		model.dispose();
+		service.dispose();
 	});
 
 	test('OutlineModel#create, cached/cancel', async function () {
@@ -78,9 +82,10 @@ suite('OutlineModel', function () {
 		const reg = languageFeaturesService.documentSymbolProvider.register({ pattern: '**/path.foo' }, {
 			provideDocumentSymbols(d, token) {
 				return new Promise(resolve => {
-					token.onCancellationRequested(_ => {
+					const l = token.onCancellationRequested(_ => {
 						isCancelled = true;
 						resolve(null);
+						l.dispose();
 					});
 				});
 			}
@@ -100,6 +105,8 @@ suite('OutlineModel', function () {
 
 		reg.dispose();
 		model.dispose();
+		service.dispose();
+
 	});
 
 	function fakeSymbolInformation(range: Range, name: string = 'foo'): DocumentSymbol {
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
index 3823efda632..1c9c3a80cdb 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
@@ -22,6 +22,7 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { EndOfLineSequence } from 'vs/editor/common/model';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('SnippetController2', function () {
 
@@ -34,7 +35,6 @@ suite('SnippetController2', function () {
 		assert.strictEqual(s.length, 0);
 	}
 
-	/** @deprecated */
 	function assertContextKeys(service: MockContextKeyService, inSnippet: boolean, hasPrev: boolean, hasNext: boolean): void {
 		const state = getContextState(service);
 		assert.strictEqual(state.inSnippet, inSnippet, `inSnippetMode`);
@@ -50,6 +50,7 @@ suite('SnippetController2', function () {
 		};
 	}
 
+	let ctrl: SnippetController2;
 	let editor: ICodeEditor;
 	let model: TextModel;
 	let contextKeys: MockContextKeyService;
@@ -76,16 +77,18 @@ suite('SnippetController2', function () {
 
 	teardown(function () {
 		model.dispose();
-	});
-
-	test('creation', () => {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
-		assertContextKeys(contextKeys, false, false, false);
 		ctrl.dispose();
 	});
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('creation', () => {
+		ctrl = instaService.createInstance(SnippetController2, editor);
+		assertContextKeys(contextKeys, false, false, false);
+	});
+
 	test('insert, insert -> abort', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		ctrl.insert('foo${1:bar}foo$0');
 		assertContextKeys(contextKeys, true, false, true);
@@ -97,7 +100,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('insert, insert -> tab, tab, done', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		ctrl.insert('${1:one}${2:two}$0');
 		assertContextKeys(contextKeys, true, false, true);
@@ -115,7 +118,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('insert, insert -> cursor moves out (left/right)', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		ctrl.insert('foo${1:bar}foo$0');
 		assertContextKeys(contextKeys, true, false, true);
@@ -127,7 +130,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('insert, insert -> cursor moves out (up/down)', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		ctrl.insert('foo${1:bar}foo$0');
 		assertContextKeys(contextKeys, true, false, true);
@@ -139,7 +142,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('insert, insert -> cursors collapse', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		ctrl.insert('foo${1:bar}foo$0');
 		assert.strictEqual(SnippetController2.InSnippetMode.getValue(contextKeys), true);
@@ -151,7 +154,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('insert, insert plain text -> no snippet mode', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		ctrl.insert('foobar');
 		assertContextKeys(contextKeys, false, false, false);
@@ -159,7 +162,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('insert, delete snippet text', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		ctrl.insert('${1:foobar}$0');
 		assertContextKeys(contextKeys, true, false, true);
@@ -183,7 +186,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('insert, nested trivial snippet', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		ctrl.insert('${1:foo}bar$0');
 		assertContextKeys(contextKeys, true, false, true);
 		assertSelections(editor, new Selection(1, 1, 1, 4), new Selection(2, 5, 2, 8));
@@ -198,7 +201,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('insert, nested snippet', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		ctrl.insert('${1:foobar}$0');
 		assertContextKeys(contextKeys, true, false, true);
 		assertSelections(editor, new Selection(1, 1, 1, 7), new Selection(2, 5, 2, 11));
@@ -217,7 +220,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('insert, nested plain text', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		ctrl.insert('${1:foobar}$0');
 		assertContextKeys(contextKeys, true, false, true);
 		assertSelections(editor, new Selection(1, 1, 1, 7), new Selection(2, 5, 2, 11));
@@ -232,7 +235,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('Nested snippets without final placeholder jumps to next outer placeholder, #27898', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		ctrl.insert('for(const ${1:element} of ${2:array}) {$0}');
 		assertContextKeys(contextKeys, true, false, true);
@@ -251,7 +254,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('Inconsistent tab stop behaviour with recursive snippets and tab / shift tab, #27543', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		ctrl.insert('1_calize(${1:nl}, \'${2:value}\')$0');
 
 		assertContextKeys(contextKeys, true, false, true);
@@ -275,7 +278,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('Snippet tabstop selecting content of previously entered variable only works when separated by space, #23728', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		model.setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
@@ -293,7 +296,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('HTML Snippets Combine, #32211', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		model.setValue('');
 		model.updateOptions({ insertSpaces: false, tabSize: 4, trimAutoWhitespace: false });
@@ -324,7 +327,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('Problems with nested snippet insertion #39594', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		model.setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
@@ -341,7 +344,7 @@ suite('SnippetController2', function () {
 
 	test('Problems with nested snippet insertion #39594 (part2)', function () {
 		// ensure selection-change-to-cancel logic isn't too aggressive
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 
 		model.setValue('a-\naaa-');
 		editor.setSelections([new Selection(2, 5, 2, 5), new Selection(1, 3, 1, 3)]);
@@ -353,7 +356,7 @@ suite('SnippetController2', function () {
 
 	test('“Nested” snippets terminating abruptly in VSCode 1.19.2. #42012', function () {
 
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
 		ctrl.insert('var ${2:${1:name}} = ${1:name} + 1;${0}');
@@ -367,7 +370,7 @@ suite('SnippetController2', function () {
 
 	test('Placeholders order #58267', function () {
 
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
 		ctrl.insert('\\pth{$1}$0');
@@ -396,7 +399,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('Must tab through deleted tab stops in snippets #31619', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
 		ctrl.insert('foo${1:a${2:bar}baz}end$0');
@@ -411,7 +414,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('Cancelling snippet mode should discard added cursors #68512 (soft cancel)', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
 
@@ -431,7 +434,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('Cancelling snippet mode should discard added cursors #68512 (hard cancel)', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
 
@@ -451,7 +454,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('User defined snippet tab stops ignored #72862', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
 
@@ -460,7 +463,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('Optional tabstop in snippets #72358', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
 
@@ -478,7 +481,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('issue #90135: confusing trim whitespace edits', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
 
@@ -487,7 +490,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('issue #145727: insertSnippet can put snippet selections in wrong positions (1 of 2)', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
 
@@ -496,7 +499,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('issue #145727: insertSnippet can put snippet selections in wrong positions (2 of 2)', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
 
@@ -506,7 +509,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('leading TAB by snippets won\'t replace by spaces #101870', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		model.updateOptions({ insertSpaces: true, tabSize: 4 });
 		ctrl.insert('\tHello World\n\tNew Line');
@@ -514,7 +517,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('leading TAB by snippets won\'t replace by spaces #101870 (part 2)', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		model.updateOptions({ insertSpaces: true, tabSize: 4 });
 		ctrl.insert('\tHello World\n\tNew Line\n${1:\tmore}');
@@ -525,7 +528,7 @@ suite('SnippetController2', function () {
 
 		{
 			// HAPPY - no nested snippet
-			const ctrl = instaService.createInstance(SnippetController2, editor);
+			ctrl = instaService.createInstance(SnippetController2, editor);
 			model.setValue('');
 			model.updateOptions({ insertSpaces: true, tabSize: 4 });
 			ctrl.insert('$1\n\n${1/([A-Za-z0-9]+): ([A-Za-z]+).*/$1: \'$2\',/gm}');
@@ -536,7 +539,7 @@ suite('SnippetController2', function () {
 			assert.strictEqual(model.getValue(), `foo: number;\n\nfoo: 'number',`);
 		}
 
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		model.updateOptions({ insertSpaces: true, tabSize: 4 });
 		ctrl.insert('$1\n\n${1/([A-Za-z0-9]+): ([A-Za-z]+).*/$1: \'$2\',/gm}');
@@ -553,7 +556,7 @@ suite('SnippetController2', function () {
 
 		test('apply, tab, done', function () {
 
-			const ctrl = instaService.createInstance(SnippetController2, editor);
+			ctrl = instaService.createInstance(SnippetController2, editor);
 
 			model.setValue('foo("bar")');
 
@@ -575,7 +578,7 @@ suite('SnippetController2', function () {
 
 			model.setValue('foo("bar")');
 
-			const ctrl = instaService.createInstance(SnippetController2, editor);
+			ctrl = instaService.createInstance(SnippetController2, editor);
 			ctrl.apply([
 				{ range: new Range(1, 5, 1, 10), template: '$1' },
 				{ range: new Range(1, 1, 1, 1), template: 'const ${1:new_const}$0 = "bar";\n' }
@@ -594,7 +597,7 @@ suite('SnippetController2', function () {
 
 			model.setValue('foo\nbar');
 
-			const ctrl = instaService.createInstance(SnippetController2, editor);
+			ctrl = instaService.createInstance(SnippetController2, editor);
 			ctrl.apply([
 				{ range: new Range(1, 4, 1, 4), template: '${3}' },
 				{ range: new Range(2, 4, 2, 4), template: '$3' },
@@ -616,7 +619,7 @@ suite('SnippetController2', function () {
 
 		test('nested into apply works', function () {
 
-			const ctrl = instaService.createInstance(SnippetController2, editor);
+			ctrl = instaService.createInstance(SnippetController2, editor);
 			model.setValue('onetwo');
 
 			editor.setSelections([new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1)]);
@@ -647,7 +650,7 @@ suite('SnippetController2', function () {
 
 		test('nested into insert abort "outer" snippet', function () {
 
-			const ctrl = instaService.createInstance(SnippetController2, editor);
+			ctrl = instaService.createInstance(SnippetController2, editor);
 			model.setValue('one\ntwo');
 
 			editor.setSelections([new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1)]);
@@ -668,7 +671,7 @@ suite('SnippetController2', function () {
 
 		test('nested into "insert" abort "outer" snippet (2)', function () {
 
-			const ctrl = instaService.createInstance(SnippetController2, editor);
+			ctrl = instaService.createInstance(SnippetController2, editor);
 			model.setValue('one\ntwo');
 
 			editor.setSelections([new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1)]);
@@ -700,7 +703,7 @@ suite('SnippetController2', function () {
 
 	test('Bug: cursor position $0 with user snippets #163808', function () {
 
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 
 		ctrl.insert('<Element1 Attr1="foo" $1>\n  <Element2 Attr1="$2"/>\n$0"\n</Element1>');
@@ -713,7 +716,7 @@ suite('SnippetController2', function () {
 	});
 
 	test('EOL-Sequence (CRLF) shifts tab stop in isFileTemplate snippets #167386', function () {
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		model.setValue('');
 		model.setEOL(EndOfLineSequence.CRLF);
 
@@ -730,7 +733,7 @@ suite('SnippetController2', function () {
 		model.setValue('function foo(f, x, condition) {\n    f();\n    return x;\n}');
 		const sel = new Range(2, 5, 3, 14);
 		editor.setSelection(sel);
-		const ctrl = instaService.createInstance(SnippetController2, editor);
+		ctrl = instaService.createInstance(SnippetController2, editor);
 		ctrl.apply([{
 			range: sel,
 			template: 'if (${1:condition}) {\n\t$TM_SELECTED_TEXT$0\n}'
diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts
index 9e8fbaee192..0ca6b0e09d0 100644
--- a/src/vs/editor/contrib/suggest/browser/suggest.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggest.ts
@@ -146,7 +146,6 @@ export class CompletionItem {
 			this._resolveCache = Promise.resolve(this.provider.resolveCompletionItem!(this.completion, token)).then(value => {
 				Object.assign(this.completion, value);
 				this._resolveDuration = sw.elapsed();
-				sub.dispose();
 			}, err => {
 				if (isCancellationError(err)) {
 					// the IPC queue will reject the request with the
@@ -154,6 +153,8 @@ export class CompletionItem {
 					this._resolveCache = undefined;
 					this._resolveDuration = undefined;
 				}
+			}).finally(() => {
+				sub.dispose();
 			});
 		}
 		return this._resolveCache;
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index 09ebd2bdda0..6a03536715e 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -209,7 +209,7 @@ export class SuggestWidget implements IDisposable {
 		this._messageElement = dom.append(this.element.domNode, dom.$('.message'));
 		this._listElement = dom.append(this.element.domNode, dom.$('.tree'));
 
-		const details = instantiationService.createInstance(SuggestDetailsWidget, this.editor);
+		const details = this._disposables.add(instantiationService.createInstance(SuggestDetailsWidget, this.editor));
 		details.onDidClose(this.toggleDetails, this, this._disposables);
 		this._details = new SuggestDetailsOverlay(details, this.editor);
 
@@ -399,10 +399,12 @@ export class SuggestWidget implements IDisposable {
 					}
 				}, 250);
 				const sub = token.onCancellationRequested(() => loading.dispose());
-				const result = await item.resolve(token);
-				loading.dispose();
-				sub.dispose();
-				return result;
+				try {
+					return await item.resolve(token);
+				} finally {
+					loading.dispose();
+					sub.dispose();
+				}
 			});
 
 			this._currentSuggestionDetails.then(() => {
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
index 5b843a83563..25d19c054d2 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
@@ -60,6 +60,8 @@ export class SuggestWidgetStatus {
 
 	dispose(): void {
 		this._menuDisposables.dispose();
+		this._leftActions.dispose();
+		this._rightActions.dispose();
 		this.element.remove();
 	}
 
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
index 4e8202abc64..f24030cb93e 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestController.test.ts
@@ -43,18 +43,20 @@ suite('SuggestController', function () {
 	let model: TextModel;
 	const languageFeaturesService = new LanguageFeaturesService();
 
-
 	teardown(function () {
+
 		disposables.clear();
 	});
 
+	// ensureNoDisposablesAreLeakedInTestSuite();
+
 	setup(function () {
 
 		const serviceCollection = new ServiceCollection(
 			[ILanguageFeaturesService, languageFeaturesService],
 			[ITelemetryService, NullTelemetryService],
 			[ILogService, new NullLogService()],
-			[IStorageService, new InMemoryStorageService()],
+			[IStorageService, disposables.add(new InMemoryStorageService())],
 			[IKeybindingService, new MockKeybindingService()],
 			[IEditorWorkerService, new class extends mock<IEditorWorkerService>() {
 				override computeWordRanges() {
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
index 7d2b9f51bb8..2bbfe524bfb 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
@@ -40,15 +40,17 @@ import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeat
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { getSnippetSuggestSupport, setSnippetSuggestSupport } from 'vs/editor/contrib/suggest/browser/suggest';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 
 function createMockEditor(model: TextModel, languageFeaturesService: ILanguageFeaturesService): ITestCodeEditor {
 
+	const storeService = new InMemoryStorageService();
 	const editor = createTestCodeEditor(model, {
 		serviceCollection: new ServiceCollection(
 			[ILanguageFeaturesService, languageFeaturesService],
 			[ITelemetryService, NullTelemetryService],
-			[IStorageService, new InMemoryStorageService()],
+			[IStorageService, storeService],
 			[IKeybindingService, new MockKeybindingService()],
 			[ISuggestMemoryService, new class implements ISuggestMemoryService {
 				declare readonly _serviceBrand: undefined;
@@ -66,8 +68,11 @@ function createMockEditor(model: TextModel, languageFeaturesService: ILanguageFe
 			}],
 		),
 	});
-	editor.registerAndInstantiateContribution(SnippetController2.ID, SnippetController2);
+	const ctrl = editor.registerAndInstantiateContribution(SnippetController2.ID, SnippetController2);
 	editor.hasWidgetFocus = () => true;
+
+	editor.registerDisposable(ctrl);
+	editor.registerDisposable(storeService);
 	return editor;
 }
 
@@ -141,6 +146,8 @@ suite('SuggestModel - Context', function () {
 		disposables.dispose();
 	});
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('Context - shouldAutoTrigger', function () {
 		const model = createTextModel('Das Pferd frisst keinen Gurkensalat - Philipp Reis 1861.\nWer hat\'s erfunden?');
 		disposables.add(model);
@@ -220,6 +227,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 		disposables.dispose();
 	});
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	function withOracle(callback: (model: SuggestModel, editor: ITestCodeEditor) => any): Promise<any> {
 
 		return new Promise((resolve, reject) => {
diff --git a/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts b/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
index 72a287f12a0..04f7bce1cc1 100644
--- a/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
@@ -26,6 +26,7 @@ import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/te
 import { NullLogService } from 'vs/platform/log/common/log';
 import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
 import { ILanguageService } from 'vs/editor/common/languages/language';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('suggest, word distance', function () {
 
@@ -88,6 +89,8 @@ suite('suggest, word distance', function () {
 		disposables.clear();
 	});
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	function createSuggestItem(label: string, overwriteBefore: number, position: IPosition): CompletionItem {
 		const suggestion: languages.CompletionItem = {
 			label,
diff --git a/src/vs/platform/actions/test/common/menuService.test.ts b/src/vs/platform/actions/test/common/menuService.test.ts
index caf3ad95463..70b864c76bd 100644
--- a/src/vs/platform/actions/test/common/menuService.test.ts
+++ b/src/vs/platform/actions/test/common/menuService.test.ts
@@ -6,6 +6,7 @@
 import * as assert from 'assert';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { generateUuid } from 'vs/base/common/uuid';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { isIMenuItem, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { MenuService } from 'vs/platform/actions/common/menuService';
 import { NullCommandService } from 'vs/platform/commands/test/common/nullCommandService';
@@ -38,6 +39,8 @@ suite('MenuService', function () {
 		disposables.clear();
 	});
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('group sorting', function () {
 
 		disposables.add(MenuRegistry.appendMenuItem(testMenuId, {
@@ -65,7 +68,7 @@ suite('MenuService', function () {
 			group: 'navigation'
 		}));
 
-		const groups = menuService.createMenu(testMenuId, contextKeyService).getActions();
+		const groups = disposables.add(menuService.createMenu(testMenuId, contextKeyService)).getActions();
 
 		assert.strictEqual(groups.length, 5);
 		const [one, two, three, four, five] = groups;
@@ -94,7 +97,7 @@ suite('MenuService', function () {
 			group: 'Hello'
 		}));
 
-		const groups = menuService.createMenu(testMenuId, contextKeyService).getActions();
+		const groups = disposables.add(menuService.createMenu(testMenuId, contextKeyService)).getActions();
 
 		assert.strictEqual(groups.length, 1);
 		const [, actions] = groups[0];
@@ -131,7 +134,7 @@ suite('MenuService', function () {
 			order: -1
 		}));
 
-		const groups = menuService.createMenu(testMenuId, contextKeyService).getActions();
+		const groups = disposables.add(menuService.createMenu(testMenuId, contextKeyService)).getActions();
 
 		assert.strictEqual(groups.length, 1);
 		const [, actions] = groups[0];
@@ -165,7 +168,7 @@ suite('MenuService', function () {
 			order: 1.1
 		}));
 
-		const groups = menuService.createMenu(testMenuId, contextKeyService).getActions();
+		const groups = disposables.add(menuService.createMenu(testMenuId, contextKeyService)).getActions();
 
 		assert.strictEqual(groups.length, 1);
 		const [[, actions]] = groups;
@@ -183,7 +186,7 @@ suite('MenuService', function () {
 			command: { id: 'a', title: 'Explicit' }
 		}));
 
-		MenuRegistry.addCommand({ id: 'b', title: 'Implicit' });
+		disposables.add(MenuRegistry.addCommand({ id: 'b', title: 'Implicit' }));
 
 		let foundA = false;
 		let foundB = false;